summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/glue/bookmarklet_unittest.cc2
-rw-r--r--webkit/tools/test_shell/event_sending_controller.cc10
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc2
-rw-r--r--webkit/tools/test_shell/test_worker/test_worker_main.cc2
4 files changed, 12 insertions, 4 deletions
diff --git a/webkit/glue/bookmarklet_unittest.cc b/webkit/glue/bookmarklet_unittest.cc
index da06bd1..4412d61 100644
--- a/webkit/glue/bookmarklet_unittest.cc
+++ b/webkit/glue/bookmarklet_unittest.cc
@@ -4,6 +4,8 @@
#include "config.h"
+#undef LOG
+
#include "testing/gtest/include/gtest/gtest.h"
#include "base/file_util.h"
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index 0e1939a..7165bb6 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -14,15 +14,17 @@
// The behavior of queuing events and replaying them can be disabled by a
// layout test by setting eventSender.dragMode to false.
-#include "webkit/tools/test_shell/event_sending_controller.h"
-
-#include <queue>
-
// TODO(darin): This is very wrong. We should not be including WebCore headers
// directly like this!!
#include "config.h"
#include "KeyboardCodes.h"
+#undef LOG
+
+#include "webkit/tools/test_shell/event_sending_controller.h"
+
+#include <queue>
+
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/message_loop.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 654dc314..dbd199b 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -8,6 +8,8 @@
#include "config.h"
+#undef LOG
+
#include "webkit/tools/test_shell/test_webview_delegate.h"
#include "base/file_util.h"
diff --git a/webkit/tools/test_shell/test_worker/test_worker_main.cc b/webkit/tools/test_shell/test_worker/test_worker_main.cc
index 9a5912d..e20f772 100644
--- a/webkit/tools/test_shell/test_worker/test_worker_main.cc
+++ b/webkit/tools/test_shell/test_worker/test_worker_main.cc
@@ -4,6 +4,8 @@
#include "config.h"
+#undef LOG
+
#include "base/at_exit.h"
#include "base/gfx/native_widget_types.h"
#include "base/logging.h"