Revert 198675 "Reland 198495 for Windows."

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/files/file_path.h"
 #include "base/logging.h"
 #include "base/native_library.h"
@@ skipping 33 matching lines @@
              .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;
 }
 
-#if !defined(OS_WIN)
-// On platforms other than Windows (i.e. mac and linux based ones),
-// the location of the .so in the installed layout will be different relative
-// to the loading module than it is in the build directory.
-// GetLibPeerConnectionPath returns the path as it will be in the installed
-// layout, but to support isolated tests, we need to also support loading the
-// so in the build layout, which we do here.
-// On Windows, these layouts are the same.
-static base::FilePath GetLibPeerConnectionPathForTests() {
-  base::FilePath path;
-  CHECK(PathService::Get(base::DIR_MODULE, &path));
-  return path.Append(FILE_PATH_LITERAL("libpeerconnection.so"));
-}
-#endif
-
 bool InitializeWebRtcModule() {
   if (g_create_webrtc_media_engine)
     return true;  // InitializeWebRtcModule has already been called.
 
   base::FilePath path(GetLibPeerConnectionPath());
   DVLOG(1) << "Loading WebRTC module: " << path.value();
 
   std::string error;
   static base::NativeLibrary lib =
       base::LoadNativeLibrary(path, &error);
-#if !defined(OS_WIN)
-  if (!lib)
-    lib = base::LoadNativeLibrary(GetLibPeerConnectionPathForTests(), &error);
-#endif
   CHECK(lib);
 
   InitializeModuleFunction initialize_module =
       reinterpret_cast<InitializeModuleFunction>(
           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
@@ skipping 17 matching lines @@
   // effectively a noop.
   InitializeWebRtcModule();
   return g_create_webrtc_media_engine(adm, adm_sc, decoder_factory);
 }
 
 void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
   g_destroy_webrtc_media_engine(media_engine);
 }
 
 #endif  // LIBPEERCONNECTION_LIB