Revert "Update webrtc&libjingle 6774:6799."

third_party/libjingle/overrides/initialize_module.cc

Index: third_party/libjingle/overrides/initialize_module.cc
diff --git a/third_party/libjingle/overrides/initialize_module.cc b/third_party/libjingle/overrides/initialize_module.cc
index ce11567d4650cb6b4078f3063c60c3a19d274b14..c7ef38290ebf27505f830df6b72e74d1ab775efe 100644
--- a/third_party/libjingle/overrides/initialize_module.cc
+++ b/third_party/libjingle/overrides/initialize_module.cc
@@ -7,9 +7,9 @@
 #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 "webrtc/base/basictypes.h"
-#include "webrtc/base/logging.h"
+#include "third_party/libjingle/overrides/talk/base/logging.h"
 
 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION) || defined(LIBPEERCONNECTION_LIB)
 #error "Only compile the allocator proxy with the shared_library implementation"
@@ -81,7 +81,7 @@ bool InitializeModule(const CommandLine& command_line,
 
   *create_media_engine = &CreateWebRtcMediaEngine;
   *destroy_media_engine = &DestroyWebRtcMediaEngine;
-  *init_diagnostic_logging = &rtc::InitDiagnosticLoggingDelegateFunction;
+  *init_diagnostic_logging = &talk_base::InitDiagnosticLoggingDelegateFunction;
 
   if (CommandLine::Init(0, NULL)) {
 #if !defined(OS_WIN)