Title: [142027] trunk/Source/WebKit/chromium
- Revision
- 142027
- Author
- dch...@chromium.org
- Date
- 2013-02-06 13:35:55 -0800 (Wed, 06 Feb 2013)
Log Message
[chromium] Remove "config.h" header from WebUnitTests.cpp
https://bugs.webkit.org/show_bug.cgi?id=108966
Reviewed by Tony Chang.
This file includes headers from base/ in Chromium, and config.h
conflicts with base/logging.h. Rather than teaching certain files in
base/ not to #include base/logging.h, remove the config.h include
here. The ASSERT isn't really necessary, as attempting to run a null
test suite won't go very far anyway.
* tests/WebUnitTests.cpp:
(WebKit::RunAllUnitTests):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (142026 => 142027)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-02-06 21:30:10 UTC (rev 142026)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-02-06 21:35:55 UTC (rev 142027)
@@ -1,3 +1,19 @@
+2013-02-06 Daniel Cheng <dch...@google.com>
+
+ [chromium] Remove "config.h" header from WebUnitTests.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=108966
+
+ Reviewed by Tony Chang.
+
+ This file includes headers from base/ in Chromium, and config.h
+ conflicts with base/logging.h. Rather than teaching certain files in
+ base/ not to #include base/logging.h, remove the config.h include
+ here. The ASSERT isn't really necessary, as attempting to run a null
+ test suite won't go very far anyway.
+
+ * tests/WebUnitTests.cpp:
+ (WebKit::RunAllUnitTests):
+
2013-02-06 Terry Anderson <tdander...@chromium.org>
Add support for gesture scroll events that do not propagate to enclosing scrollables
Modified: trunk/Source/WebKit/chromium/tests/WebUnitTests.cpp (142026 => 142027)
--- trunk/Source/WebKit/chromium/tests/WebUnitTests.cpp 2013-02-06 21:30:10 UTC (rev 142026)
+++ trunk/Source/WebKit/chromium/tests/WebUnitTests.cpp 2013-02-06 21:35:55 UTC (rev 142027)
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
#include "WebUnitTests.h"
+// FIXME: Can we move this to webkit/support and fix the layering violation?
#include <base/test/test_suite.h>
#include <gmock/gmock.h>
@@ -46,8 +46,6 @@
int RunAllUnitTests()
{
- ASSERT(testSuite);
-
int result = testSuite->Run();
return result;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
