Update webrtc&libjingle 6774:6825.

third_party/libjingle/overrides/initialize_module.cc

 // Copyright 2013 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.
 
 #include "allocator_shim/allocator_stub.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "init_webrtc.h"
-#include "talk/base/basictypes.h"
 #include "talk/media/webrtc/webrtcmediaengine.h"
-#include "third_party/libjingle/overrides/talk/base/logging.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/logging.h"
 
 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION) || defined(LIBPEERCONNECTION_LIB)
 #error "Only compile the allocator proxy with the shared_library implementation"
 #endif
 
 #if defined(OS_WIN)
 #define ALLOC_EXPORT __declspec(dllexport)
 #else
 #define ALLOC_EXPORT __attribute__((visibility("default")))
 #endif
@@ skipping 51 matching lines @@
                           init_diagnostic_logging) {
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
   g_alloc = alloc;
   g_dealloc = dealloc;
 #endif
 
   g_field_trial_find_ = field_trial_find;
 
   *create_media_engine = &CreateWebRtcMediaEngine;
   *destroy_media_engine = &DestroyWebRtcMediaEngine;
-  *init_diagnostic_logging = &talk_base::InitDiagnosticLoggingDelegateFunction;
+  *init_diagnostic_logging = &rtc::InitDiagnosticLoggingDelegateFunction;
 
   if (CommandLine::Init(0, NULL)) {
 #if !defined(OS_WIN)
     // This is not needed on Windows since CommandLine::Init has already
     // done the equivalent thing via the GetCommandLine() API.
     CommandLine::ForCurrentProcess()->AppendArguments(command_line, true);
 #endif
     logging::LoggingSettings settings;
     settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
     logging::InitLogging(settings);
 
     // Override the log message handler to forward logs to chrome's handler.
     logging::SetLogMessageHandler(log_handler);
     webrtc::SetupEventTracer(trace_get_category_enabled,
                              trace_add_trace_event);
   }
 
   return true;
 }
 }  // extern "C"