Revert 208246 "Support using loadable module for libpeerconnecti..."

trunk/src/third_party/libjingle/overrides/init_webrtc.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 "init_webrtc.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/files/file_path.h"
 #include "base/native_library.h"
@@ skipping 43 matching lines @@
 // on what platform we're on.
 static base::FilePath GetLibPeerConnectionPath() {
 #if defined(OS_WIN)
   base::FilePath path(FILE_PATH_LITERAL("libpeerconnection.dll"));
 #elif defined(OS_MACOSX)
   // Simulate '@loader_path/Libraries'.
   base::FilePath path;
   CHECK(PathService::Get(base::DIR_MODULE, &path));
   path = path.Append(FILE_PATH_LITERAL("Libraries"))
              .Append(FILE_PATH_LITERAL("libpeerconnection.so"));
-#elif defined(OS_ANDROID)
-  base::FilePath path;
-  CHECK(PathService::Get(base::DIR_MODULE, &path));
-  path = path.Append(FILE_PATH_LITERAL("libpeerconnection.so"));
 #else
   base::FilePath path;
   CHECK(PathService::Get(base::DIR_MODULE, &path));
   path = path.Append(FILE_PATH_LITERAL("lib"))
              .Append(FILE_PATH_LITERAL("libpeerconnection.so"));
 #endif
   return path;
 }
 
 bool InitializeWebRtcModule() {
@@ skipping 13 matching lines @@
           base::GetFunctionPointerFromNativeLibrary(
               lib, "InitializeModule"));
 
   // Initialize the proxy by supplying it with a pointer to our
   // allocator/deallocator routines.
   // On mac we use malloc zones, which are global, so we provide NULLs for
   // the alloc/dealloc functions.
   // PS: This function is actually implemented in allocator_proxy.cc with the
   // new/delete overrides.
   return initialize_module(*CommandLine::ForCurrentProcess(),
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_MACOSX)
       &Allocate, &Dellocate,
 #endif
       logging::GetLogMessageHandler(),
       &GetCategoryGroupEnabled, &AddTraceEvent,
       &g_create_webrtc_media_engine, &g_destroy_webrtc_media_engine);
 }
 
 cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
     webrtc::AudioDeviceModule* adm,
     webrtc::AudioDeviceModule* adm_sc,
     cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory) {
   // For convenience of tests etc, we call InitializeWebRtcModule here.
   // For Chrome however, InitializeWebRtcModule must be called
   // explicitly before the sandbox is initialized.  In that case, this call is
   // effectively a noop.
   InitializeWebRtcModule();
   return g_create_webrtc_media_engine(adm, adm_sc, encoder_factory,
       decoder_factory);
 }
 
 void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
   g_destroy_webrtc_media_engine(media_engine);
 }
 
 #endif  // LIBPEERCONNECTION_LIB