Merge from Chromium at DEPS revision r214332
This commit was generated by merge_to_master.py.
Change-Id: I82a7c38de906244dc882493568013be659aa65d1
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
index 4f4555d..f40ccef 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
@@ -25,6 +25,10 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/common/content_switches.h"
+#if defined(OS_WIN) && defined(USE_ASH)
+#include "base/win/windows_version.h"
+#endif
+
namespace chrome {
namespace {
@@ -50,6 +54,12 @@
#define MAYBE_ApiTests ApiTests
#endif
IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_ApiTests) {
+#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
+
extensions::FeatureSwitch::ScopedOverride tab_capture(
extensions::FeatureSwitch::tab_capture(), true);