diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 23:34:16 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 23:34:16 +0000 |
| commit | f74c62cf2d84f87fef4444952c6ae02fffefa5be (patch) | |
| tree | 806be253cf101874bf875f4f76a9bbad17ee2fc3 | |
| parent | b406dbb36ce9005e9649b600acc4a454acc9f0ea (diff) | |
| download | chromium_src-f74c62cf2d84f87fef4444952c6ae02fffefa5be.zip chromium_src-f74c62cf2d84f87fef4444952c6ae02fffefa5be.tar.gz chromium_src-f74c62cf2d84f87fef4444952c6ae02fffefa5be.tar.bz2 | |
NaCl extension tests should check whether NaCl plugin is present.BUG=97184TEST=browser_tests
Review URL: http://codereview.chromium.org/8345029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106408 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_nacl_browsertest.cc | 17 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 5 |
2 files changed, 17 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index dc93bad..aa37a88 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -3,6 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/file_path.h" +#include "base/path_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_browsertest.h" @@ -10,9 +12,11 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/ui_test_utils.h" +#include "content/browser/plugin_service.h" #include "content/browser/tab_contents/tab_contents.h" namespace { @@ -72,9 +76,22 @@ class NaClExtensionTest : public ExtensionBrowserTest { return extension; } + bool IsNaClPluginLoaded() { + FilePath path; + if (PathService::Get(chrome::FILE_NACL_PLUGIN, &path)) { + webkit::WebPluginInfo info; + return PluginService::GetInstance()->GetPluginInfoByPath(path, &info); + } + return false; + } + void CheckPluginsCreated(const Extension* extension, bool should_create) { ui_test_utils::NavigateToURL(browser(), extension->GetResourceURL("test.html")); + // Don't run tests if the NaCl plugin isn't loaded. + if (!IsNaClPluginLoaded()) + return; + bool embedded_plugin_created = false; bool content_handler_plugin_created = false; TabContents* tab_contents = browser()->GetSelectedTabContents(); diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 35445f3..a504f72 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2592,11 +2592,6 @@ 'browser/ui/webui/print_preview.js', ], }], - ['disable_nacl==1', { - 'sources!': [ - 'browser/extensions/extension_nacl_browsertest.cc', - ], - }], ['use_virtual_keyboard==1', { 'sources': [ 'browser/ui/virtual_keyboard/virtual_keyboard_manager_browsertest.cc', |