Change include order in logging_unittest.cc

jingle/glue/logging_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Note: this test tests LOG_V and LOG_E since all other logs are expressed
 // in forms of them. LOG is also tested for good measure.
 // 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
 static const char* const log_file_name = "libjingle_logging.log";
 #endif
 
 static const int kDefaultVerbosity = 0;
 
 static const char* AsString(rtc::LoggingSeverity severity) {
   switch (severity) {
@@ skipping 122 matching lines @@
   EXPECT_TRUE(ContainsString(contents_of_file,
                              AsString(rtc::LS_WARNING)));
   EXPECT_TRUE(ContainsString(contents_of_file, AsString(rtc::LS_INFO)));
   // LOG_E
   EXPECT_TRUE(ContainsString(contents_of_file, strerror(kFakeError)));
   EXPECT_TRUE(ContainsString(contents_of_file,
                              AsString(rtc::LS_VERBOSE)));
   EXPECT_TRUE(ContainsString(contents_of_file,
                              AsString(rtc::LS_SENSITIVE)));
 }