Index: chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc |
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 cb45dfc01ba462c8cad2672f6ef0be2c7106dd57..b1faad99e1137d478fb5e706915a160b4ed9025a 100644 |
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc |
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc |
@@ -45,8 +45,8 @@ class TabCaptureApiTest : public ExtensionApiTest { |
} // namespace |
-// http://crbug.com/261493 |
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) |
+// http://crbug.com/261493 and http://crbug.com/268644 |
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_AURA) |
#define MAYBE_ApiTests DISABLED_ApiTests |
#else |
#define MAYBE_ApiTests ApiTests |
@@ -73,7 +73,13 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_ApiTests) { |
"api_tests.html")) << message_; |
} |
-IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTestsAudio) { |
+// http://crbug.com/268644 |
+#if defined(USE_AURA) |
+#define MAYBE_ApiTestsAudio DISABLED_ApiTestsAudio |
+#else |
+#define MAYBE_ApiTestsAudio ApiTestsAudio |
+#endif |
+IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_ApiTestsAudio) { |
extensions::FeatureSwitch::ScopedOverride tab_capture( |
extensions::FeatureSwitch::tab_capture(), true); |
@@ -89,8 +95,8 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTestsAudio) { |
"api_tests_audio.html")) << message_; |
} |
-// http://crbug.com/177163 |
-#if defined(OS_WIN) && !defined(NDEBUG) |
+// http://crbug.com/177163 and http://crbug.com/268644 |
+#if defined(OS_WIN) && (!defined(NDEBUG) || defined(USE_AURA)) |
#define MAYBE_EndToEnd DISABLED_EndToEnd |
#else |
#define MAYBE_EndToEnd EndToEnd |