| Index: base/native_library_linux.cc
|
| diff --git a/base/native_library_linux.cc b/base/native_library_linux.cc
|
| index e282bce2213f5d4131d4db1b1275b0eab984b12a..bcc4ffb66d06cc79cf9dde80200f5500f6243fb0 100644
|
| --- a/base/native_library_linux.cc
|
| +++ b/base/native_library_linux.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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.
|
|
|
| @@ -14,7 +14,8 @@
|
| namespace base {
|
|
|
| // static
|
| -NativeLibrary LoadNativeLibrary(const FilePath& library_path) {
|
| +NativeLibrary LoadNativeLibrary(const FilePath& library_path,
|
| + std::string* error) {
|
| // dlopen() opens the file off disk.
|
| base::ThreadRestrictions::AssertIOAllowed();
|
|
|
| @@ -23,16 +24,8 @@ NativeLibrary LoadNativeLibrary(const FilePath& library_path) {
|
| // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
|
| // and http://crbug.com/40794.
|
| void* dl = dlopen(library_path.value().c_str(), RTLD_LAZY);
|
| - if (!dl) {
|
| - std::string error_message = dlerror();
|
| - // Some obsolete plugins depend on libxul or libxpcom.
|
| - // Ignore the error messages when failing to load these.
|
| - if (error_message.find("libxul.so") == std::string::npos &&
|
| - error_message.find("libxpcom.so") == std::string::npos) {
|
| - LOG(ERROR) << "dlopen failed when trying to open " << library_path.value()
|
| - << ": " << error_message;
|
| - }
|
| - }
|
| + if (!dl && error)
|
| + *error = dlerror();
|
|
|
| return dl;
|
| }
|
|
|