diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 22:06:22 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 22:06:22 +0000 |
commit | 84479325c4ccdecd2bddc2f257d436b66595aa10 (patch) | |
tree | cd91804f50e952a09f84c6bdf7f68bdb3dab4bc4 /chrome/nacl | |
parent | e51eeb7307ea00ec6ef593d938a60f356e3a0882 (diff) | |
download | chromium_src-84479325c4ccdecd2bddc2f257d436b66595aa10.zip chromium_src-84479325c4ccdecd2bddc2f257d436b66595aa10.tar.gz chromium_src-84479325c4ccdecd2bddc2f257d436b66595aa10.tar.bz2 |
linux: don't always print dlopen errors from LoadNativeLibrary
Instead, return them to the caller and let the caller decide whether
the error is worth notifying the user about.
BUG=79068
Review URL: http://codereview.chromium.org/6864020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
-rw-r--r-- | chrome/nacl/nacl_main_platform_delegate_mac.mm | 4 | ||||
-rw-r--r-- | chrome/nacl/nacl_main_platform_delegate_win.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/nacl/nacl_main_platform_delegate_mac.mm b/chrome/nacl/nacl_main_platform_delegate_mac.mm index 19e7df7..006ee25 100644 --- a/chrome/nacl/nacl_main_platform_delegate_mac.mm +++ b/chrome/nacl/nacl_main_platform_delegate_mac.mm @@ -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. @@ -47,7 +47,7 @@ void NaClMainPlatformDelegate::InitSandboxTests(bool no_sandbox) { FilePath test_dll_name = command_line.GetSwitchValuePath(switches::kTestNaClSandbox); if (!test_dll_name.empty()) { - sandbox_test_module_ = base::LoadNativeLibrary(test_dll_name); + sandbox_test_module_ = base::LoadNativeLibrary(test_dll_name, NULL); CHECK(sandbox_test_module_); } } diff --git a/chrome/nacl/nacl_main_platform_delegate_win.cc b/chrome/nacl/nacl_main_platform_delegate_win.cc index cfe38ff..02feff0 100644 --- a/chrome/nacl/nacl_main_platform_delegate_win.cc +++ b/chrome/nacl/nacl_main_platform_delegate_win.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. @@ -51,7 +51,7 @@ void NaClMainPlatformDelegate::InitSandboxTests(bool no_sandbox) { test_dll_name = test_dll_name.ReplaceExtension(L"dll"); #endif DVLOG(1) << "Loading test lib " << test_dll_name.value() << "\n"; - sandbox_test_module_ = base::LoadNativeLibrary(test_dll_name); + sandbox_test_module_ = base::LoadNativeLibrary(test_dll_name, NULL); CHECK(sandbox_test_module_); VLOG(1) << "Testing NaCl sandbox\n"; } |