diff options
author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 19:32:47 +0000 |
---|---|---|
committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 19:32:47 +0000 |
commit | 988e6588de319fd5a3329f204659bd634b1238bb (patch) | |
tree | 45b1a67e79f66e720925fd149d75bcd908a4fc0c /chrome/browser/extensions/plugin_apitest.cc | |
parent | ae7b9db917e49838a5c6c09f7eae4a451f3c264f (diff) | |
download | chromium_src-988e6588de319fd5a3329f204659bd634b1238bb.zip chromium_src-988e6588de319fd5a3329f204659bd634b1238bb.tar.gz chromium_src-988e6588de319fd5a3329f204659bd634b1238bb.tar.bz2 |
Disable failing Ash browser_tests (on win8: browser_tests.exe --ash-browsertests)
Ran the tests locally and disabled all failing tests (I think...), will run a second pass locally and then we can push them on the waterfall
Temporarily disabled tests are tracked @ https://docs.google.com/a/google.com/document/d/110YdKCAj3MxECZcW3iwYLjgTdzs2aZicLeA8OrC20Zo/edit
BUG=179830, 262796
Review URL: https://chromiumcodereview.appspot.com/19697010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/plugin_apitest.cc')
-rw-r--r-- | chrome/browser/extensions/plugin_apitest.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index 6c0c08e..16d5ed9 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -20,6 +20,10 @@ #include "content/public/test/browser_test_utils.h" #include "net/base/net_util.h" +#if defined(OS_WIN) && defined(USE_ASH) +#include "base/win/windows_version.h" +#endif + using content::NavigationController; using content::WebContents; using extensions::Extension; @@ -124,6 +128,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { #endif // Tests that private extension plugins are only visible to the extension. IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginPrivate) { +#if defined(OS_WIN) && defined(USE_ASH) + // Disable this test in Metro+Ash for now (http://crbug.com/262796). + if (base::win::GetVersion() >= base::win::VERSION_WIN8) + return; +#endif + if (!content::PluginService::GetInstance()->NPAPIPluginsSupported()) return; |