Commit d7c94e2d authored by tommi's avatar tommi Committed by Commit bot

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}
parent 3e5eeefe
...@@ -7,16 +7,18 @@ ...@@ -7,16 +7,18 @@
// Also note that we are only allowed to call InitLogging() twice so the test // Also note that we are only allowed to call InitLogging() twice so the test
// cases are more dense than normal. // 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. // libjingle style logging is used.
#define LOGGING_INSIDE_WEBRTC #define LOGGING_INSIDE_WEBRTC
#include "third_party/webrtc/overrides/webrtc/base/logging.h" #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) #if defined(OS_WIN)
static const wchar_t* const log_file_name = L"libjingle_logging.log"; static const wchar_t* const log_file_name = L"libjingle_logging.log";
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment