Changeset 142027 in webkit

Timestamp:

Feb 6, 2013 1:35:55 PM (11 years ago)

Author:

dcheng@chromium.org

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):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• tests/WebUnitTests.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-02-06  Daniel Cheng  <dcheng@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  <tdanderson@chromium.org>
 

trunk/Source/WebKit/chromium/tests/WebUnitTests.cpp

@@ -29 +29 @@
  */
 
-#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>
@@ -47 +47 @@
 int RunAllUnitTests()
 {
-    ASSERT(testSuite);
-
     int result = testSuite->Run();