diff options
| author | tommi <tommi@chromium.org> | 2015-03-20 03:56:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-20 10:57:44 +0000 |
| commit | d7c94e2d2e8e49f439e805e8f210822824f85cbd (patch) | |
| tree | adee8b8af64983a9f92c2f6d0ac86fbf61b9a5f8 /jingle/glue | |
| parent | 3e5eeefe5f5c51191609d0839a9c3b87ab076121 (diff) | |
| download | chromium_src-d7c94e2d2e8e49f439e805e8f210822824f85cbd.zip chromium_src-d7c94e2d2e8e49f439e805e8f210822824f85cbd.tar.gz chromium_src-d7c94e2d2e8e49f439e805e8f210822824f85cbd.tar.bz2 | |
Change include order in logging_unittest.cc
to not override Chromium logging macros in Chromium headers.
BUG=468375
TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/1002013010
Cr-Commit-Position: refs/heads/master@{#321546}
Diffstat (limited to 'jingle/glue')
| -rw-r--r-- | jingle/glue/logging_unittest.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/jingle/glue/logging_unittest.cc b/jingle/glue/logging_unittest.cc index a98d6a1..579832f 100644 --- a/jingle/glue/logging_unittest.cc +++ b/jingle/glue/logging_unittest.cc @@ -7,16 +7,18 @@ // Also note that we are only allowed to call InitLogging() twice so the test // cases are more dense than normal. -// The following include must be first in this file. It ensures that +// We must include Chromium headers before including the overrides header +// since webrtc's logging.h file may conflict with chromium. +#include "base/command_line.h" +#include "base/files/file_util.h" +#include "testing/gtest/include/gtest/gtest.h" + +// The following include come before including logging.h. It ensures that // libjingle style logging is used. #define LOGGING_INSIDE_WEBRTC #include "third_party/webrtc/overrides/webrtc/base/logging.h" -#include "base/command_line.h" -#include "base/files/file_util.h" -#include "testing/gtest/include/gtest/gtest.h" - #if defined(OS_WIN) static const wchar_t* const log_file_name = L"libjingle_logging.log"; #else |