diff options
| author | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 02:24:28 +0000 |
|---|---|---|
| committer | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 02:24:28 +0000 |
| commit | 10257996936d54ebbaee86367e275fa6989053a7 (patch) | |
| tree | d2cf392b8c911a2c984642bfc8bbdb0071e4632a /ppapi | |
| parent | fd1c7915c1ec55cbdf86f9789f6e25ba4718550d (diff) | |
| download | chromium_src-10257996936d54ebbaee86367e275fa6989053a7.zip chromium_src-10257996936d54ebbaee86367e275fa6989053a7.tar.gz chromium_src-10257996936d54ebbaee86367e275fa6989053a7.tar.bz2 | |
Eliminate last references to disable_dynamic_plugin_loading in Chrome repo.
BUG= http://code.google.com/p/chromium/issues/detail?id=154400
Review URL: https://chromiumcodereview.appspot.com/11028082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
3 files changed, 3 insertions, 17 deletions
diff --git a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons index e8aad25..1d1765d 100644 --- a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons +++ b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons @@ -5,9 +5,7 @@ Import('env') -# Breakpad crash reporting only works when NaCl is built into Chromium. -if (env.Bit('disable_dynamic_plugin_loading') and - (env.Bit('host_windows') or env.Bit('host_mac'))): +if env.Bit('host_windows') or env.Bit('host_mac'): expected_crash_dumps = 1 else: # We are also checking that crash dumping does not work diff --git a/ppapi/native_client/tests/nacl_browser/browser_startup_time/nacl.scons b/ppapi/native_client/tests/nacl_browser/browser_startup_time/nacl.scons index 308042bd..10c0c076 100644 --- a/ppapi/native_client/tests/nacl_browser/browser_startup_time/nacl.scons +++ b/ppapi/native_client/tests/nacl_browser/browser_startup_time/nacl.scons @@ -53,7 +53,7 @@ env.AddNodeToTestSuite(node, # open a file. This won't work with the outer sandbox # which is enabled in some cases. is_broken=(env.PPAPIBrowserTesterIsBroken() or - env.Bit('disable_dynamic_plugin_loading'))) + True)) # Also check the size of this nexe. node = env.FileSizeTest('browser_startup_size.out', diff --git a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons index 801e072..4731ff3 100644 --- a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons @@ -54,19 +54,7 @@ node = env.PPAPIBrowserTester('ppapi_extension_mime_handler.out', env.Depends(node, dest_copy) -# If this test is run in the standalone NaCl build, Chromium will use -# out-of-sync versions of service_runtime and the IRT. Chromium will -# use its (old) built-in versions of the trusted NaCl plugin and -# service_runtime, but these will use the locally-built (new) version -# of the IRT supplied via the NACL_IRT_LIBRARY environment variable. -# This version skew can cause the test to fail in some circumstances, -# so we disable this test in the standalone NaCl build, where running -# Chromium tests is deprecated anyway. For more info, see: -# http://code.google.com/p/chromium/issues/detail?id=138289 -is_broken = (env.PPAPIBrowserTesterIsBroken() or - not env.Bit('disable_dynamic_plugin_loading')) - env.AddNodeToTestSuite(node, ['chrome_browser_tests'], 'run_ppapi_extension_mime_handler_browser_test', - is_broken=is_broken) + is_broken=env.PPAPIBrowserTesterIsBroken()) |