diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 21:25:34 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 21:25:34 +0000 |
| commit | d25e33ae95843833cc90fa266980911156d2ded0 (patch) | |
| tree | 37dae9fa53f6acf964f8f875a556df537f90d311 /webkit/glue/bookmarklet_unittest.cc | |
| parent | 776b7aa80e8145ff20368c075e3c8052c7ef2d4f (diff) | |
| download | chromium_src-d25e33ae95843833cc90fa266980911156d2ded0.zip chromium_src-d25e33ae95843833cc90fa266980911156d2ded0.tar.gz chromium_src-d25e33ae95843833cc90fa266980911156d2ded0.tar.bz2 | |
Add a few more |#undef LOG| directives to code that might see both WebKit's
and Chromium's definitions of LOG. This is necessary after WebKit r47092
exposed its LOG in a few more places.
BUG=0
TEST=WebKit Canaries come back to life
Review URL: http://codereview.chromium.org/164421
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/bookmarklet_unittest.cc')
| -rw-r--r-- | webkit/glue/bookmarklet_unittest.cc | 2 |
1 files changed, 2 insertions, 0 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" |