Enable software compositing in renderer for win aura.

chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
 #include "base/strings/stringprintf.h"
@@ skipping 27 matching lines @@
   TabCaptureApiTest() {}
 
   void AddExtensionToCommandLineWhitelist() {
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kWhitelistedExtensionID, kExtensionId);
   }
 };
 
 }  // 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
 #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 (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   extensions::FeatureSwitch::ScopedOverride tab_capture(
       extensions::FeatureSwitch::tab_capture(), true);
 
 #if defined(OS_WIN)
   // TODO(justinlin): Disabled for WinXP due to timeout issues.
   if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     return;
   }
 #endif
 
   AddExtensionToCommandLineWhitelist();
   ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental",
                                   "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);
 
 #if defined(OS_WIN)
   // TODO(justinlin): Disabled for WinXP due to timeout issues.
   if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     return;
   }
 #endif
 
   AddExtensionToCommandLineWhitelist();
   ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental",
                                   "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
 #endif
 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_EndToEnd) {
   extensions::FeatureSwitch::ScopedOverride tab_capture(
       extensions::FeatureSwitch::tab_capture(), true);
 
 #if defined(OS_WIN)
   // TODO(justinlin): Disabled for WinXP due to timeout issues.
@@ skipping 141 matching lines @@
   browser()->fullscreen_controller()->ToggleFullscreenModeForTab(web_contents,
                                                                  false);
   fullscreen_entered.Reply("");
 
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 }  // namespace chrome