| Index: webkit/glue/plugins/plugin_lib_linux.cc
|
| diff --git a/webkit/glue/plugins/plugin_lib_linux.cc b/webkit/glue/plugins/plugin_lib_linux.cc
|
| index 36de951944eb753119c2be355e12b359a2c7ee25..c88ffeee9bc0a1946291a9b079762ba8aac136f2 100644
|
| --- a/webkit/glue/plugins/plugin_lib_linux.cc
|
| +++ b/webkit/glue/plugins/plugin_lib_linux.cc
|
| @@ -19,36 +19,12 @@
|
|
|
| namespace NPAPI {
|
|
|
| -// static
|
| -PluginLib::NativeLibrary PluginLib::LoadNativeLibrary(
|
| - const FilePath& library_path) {
|
| - void* dl = dlopen(library_path.value().c_str(), RTLD_LAZY);
|
| - if (!dl)
|
| - NOTREACHED() << "dlopen failed: " << dlerror();
|
| -
|
| - return dl;
|
| -}
|
| -
|
| -// static
|
| -void PluginLib::UnloadNativeLibrary(NativeLibrary library) {
|
| - int ret = dlclose(library);
|
| - if (ret < 0)
|
| - NOTREACHED() << "dlclose failed: " << dlerror();
|
| -}
|
| -
|
| -// static
|
| -void* PluginLib::GetFunctionPointerFromNativeLibrary(
|
| - NativeLibrary library,
|
| - NativeLibraryFunctionNameType name) {
|
| - return dlsym(library, name);
|
| -}
|
| -
|
| bool PluginLib::ReadWebPluginInfo(const FilePath& filename,
|
| WebPluginInfo* info) {
|
| // The file to reference is:
|
| // http://mxr.mozilla.org/firefox/source/modules/plugin/base/src/nsPluginsDirUnix.cpp
|
|
|
| - void* dl = LoadNativeLibrary(filename);
|
| + void* dl = base::LoadNativeLibrary(filename);
|
| if (!dl)
|
| return false;
|
|
|
|
|