Misc clean-up of TabCaptureApiTests; and re-enable more tests.

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"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 18 matching lines @@
 #endif
 
 namespace extensions {
 
 namespace {
 
 const char kExtensionId[] = "ddchlicdkolnonkihahngkmmmjnjlkkf";
 
 class TabCaptureApiTest : public ExtensionApiTest {
  public:
+  void SetUpCommandLine(CommandLine* command_line) override {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+    // Specify smallish window size to make testing of tab capture less CPU
+    // intensive.
+    command_line->AppendSwitchASCII(::switches::kWindowSize, "300,300");

[miu, 2014/11/19 01:15:54]

Many of the Tab Capture API tests could be slow running on overloaded systems
simply because exercising the API will start the expensive process of frame
capture.  So, I'm making it so all tests, not just the EndToEnd ones, have a
smallish window size to mitigate that.

+  }
+
   void AddExtensionToCommandLineWhitelist() {
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kWhitelistedExtensionID, kExtensionId);
   }
 };
 
 class TabCaptureApiPixelTest : public TabCaptureApiTest {
  public:
-  void SetUpCommandLine(CommandLine* command_line) override {
-    TabCaptureApiTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitchASCII(::switches::kWindowSize, "300,300");
-  }
-
   void SetUp() override {
     if (!IsTooIntensiveForThisPlatform())
       EnablePixelOutput();
     TabCaptureApiTest::SetUp();
   }
 
  protected:
   bool IsTooIntensiveForThisPlatform() const {
 #if defined(OS_WIN)
     if (base::win::GetVersion() < base::win::VERSION_VISTA)
       return true;
 #endif
 
     // The tests are too slow to succeed with OSMesa on the bots.
     if (UsingOSMesa())
       return true;
 
 #if defined(NDEBUG)
     return false;
 #else
     // TODO(miu): Look into enabling these tests for the Debug build bots once
     // they prove to be stable again on the Release bots.
     // http://crbug.com/396413
     return !CommandLine::ForCurrentProcess()->HasSwitch(
         "run-tab-capture-api-pixel-tests");
 #endif
   }
 };
 
+// Tests API behaviors, including info queries, and constraints violations.
 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTests) {
-#if defined(OS_WIN)
-  // TODO(justinlin): Disabled for WinXP due to timeout issues.

[miu, 2014/11/19 01:15:54]

I think these isWinXP() checks are just left-overs from before we identified
that the real problem was that *all* the Win Debug extension tests that are
fundamentally broken (http://crbug.com/177163).  In any case, there are no Win
XP trybots to confirm, so we'll have to see if this sticks in the tree.

-  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
-    return;
-  }
-#endif
-
   AddExtensionToCommandLineWhitelist();
   ASSERT_TRUE(RunExtensionSubtest("tab_capture", "api_tests.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTestsAudio) {

[miu, 2014/11/19 01:15:54]

Merged into TabCaptureApiTest.ApiTests.

-#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", "api_tests_audio.html"))
-      << message_;
-}
-
 // Tests that tab capture video frames can be received in a VIDEO element.
 IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, EndToEndWithoutRemoting) {
   if (IsTooIntensiveForThisPlatform()) {
     LOG(WARNING) << "Skipping this CPU-intensive test on this platform/build.";
     return;
   }
   AddExtensionToCommandLineWhitelist();
   ASSERT_TRUE(RunExtensionSubtest(
       "tab_capture", "end_to_end.html?method=local&colorDeviation=10"))
       << message_;
@@ skipping 13 matching lines @@
       "tab_capture", "end_to_end.html?method=webrtc&colorDeviation=50"))
       << message_;
 }
 
 // http://crbug.com/177163
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_GetUserMediaTest DISABLED_GetUserMediaTest
 #else
 #define MAYBE_GetUserMediaTest GetUserMediaTest
 #endif
-// Test that we can't get tabCapture streams using GetUserMedia directly.
+// Tests that getUserMedia() is NOT a way to start tab capture.
 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_GetUserMediaTest) {
   ExtensionTestMessageListener listener("ready", true);
 
   ASSERT_TRUE(RunExtensionSubtest("tab_capture", "get_user_media_test.html"))
       << message_;
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   content::OpenURLParams params(GURL("about:blank"), content::Referrer(),
                                 NEW_FOREGROUND_TAB,
@@ skipping 67 matching lines @@
 #elif defined(USE_AURA) || defined(OS_MACOSX)
 // These don't always fire fullscreen events when run in tests. Tested manually.
 #define MAYBE_FullscreenEvents DISABLED_FullscreenEvents
 #elif defined(OS_LINUX)
 // Flaky to get out of fullscreen in tests. Tested manually.
 #define MAYBE_FullscreenEvents DISABLED_FullscreenEvents
 #else
 #define MAYBE_FullscreenEvents FullscreenEvents
 #endif
 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_FullscreenEvents) {
-#if defined(OS_WIN)
-  // TODO(justinlin): Disabled for WinXP due to timeout issues.
-  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
-    return;
-  }
-#endif
-
   AddExtensionToCommandLineWhitelist();
 
   content::OpenURLParams params(GURL("chrome://version"),
                                 content::Referrer(),
                                 CURRENT_TAB,
                                 ui::PAGE_TRANSITION_LINK, false);
   content::WebContents* web_contents = browser()->OpenURL(params);
 
   ExtensionTestMessageListener listeners_setup("ready1", true);
   ExtensionTestMessageListener fullscreen_entered("ready2", true);
@@ skipping 11 matching lines @@
   EXPECT_TRUE(fullscreen_entered.WaitUntilSatisfied());
   browser()->fullscreen_controller()->ToggleFullscreenModeForTab(web_contents,
                                                                  false);
   fullscreen_entered.Reply("");
 
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
-// Times out on Win dbg bots: http://crbug.com/177163
-// #if defined(OS_WIN) && !defined(NDEBUG)
-// Times out on all Win bots, flaky on MSan bots: http://crbug.com/294431
-#if defined(OS_WIN) || defined(MEMORY_SANITIZER)
+// http://crbug.com/177163
+#if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_GrantForChromePages DISABLED_GrantForChromePages
 #else
 #define MAYBE_GrantForChromePages GrantForChromePages
 #endif
 // Make sure tabCapture API can be granted for Chrome:// pages.
 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_GrantForChromePages) {
   ExtensionTestMessageListener before_open_tab("ready1", true);
   ASSERT_TRUE(RunExtensionSubtest("tab_capture",
                                   "active_tab_chrome_pages.html"))
       << message_;
@@ skipping 10 matching lines @@
   TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter()->GrantIfRequested(extension);
   before_open_tab.Reply("");
 
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // http://crbug.com/177163
-#if (defined(OS_WIN) && !defined(NDEBUG)) || defined(OS_MACOSX)
-// http://crbug.com/326319
+#if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_CaptureInSplitIncognitoMode DISABLED_CaptureInSplitIncognitoMode
 #else
 #define MAYBE_CaptureInSplitIncognitoMode CaptureInSplitIncognitoMode
 #endif
-// Test that a tab can be captured in split incognito mode.
+// Tests that a tab in incognito mode can be captured.
 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_CaptureInSplitIncognitoMode) {
   AddExtensionToCommandLineWhitelist();
   ASSERT_TRUE(RunExtensionSubtest("tab_capture",
-                                  "incognito.html",
+                                  "start_tab_capture.html",
                                   kFlagEnableIncognito | kFlagUseIncognito))
       << message_;
 }
 
 // http://crbug.com/177163
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_Constraints DISABLED_Constraints
 #else
 #define MAYBE_Constraints Constraints
 #endif
+// Tests that valid constraints allow tab capture to start, while invalid ones
+// do not.
 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_Constraints) {
   AddExtensionToCommandLineWhitelist();
   ASSERT_TRUE(RunExtensionSubtest("tab_capture", "constraints.html"))
       << message_;
 }
 
 // http://crbug.com/177163
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_TabIndicator DISABLED_TabIndicator
 #else
 #define MAYBE_TabIndicator TabIndicator
 #endif
+// Tests that the tab indicator (in the tab strip) is shown during tab capture.
 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_TabIndicator) {
   ASSERT_EQ(TAB_MEDIA_STATE_NONE,
             chrome::GetTabMediaStateForContents(
                 browser()->tab_strip_model()->GetActiveWebContents()));
 
   // Run an extension test that just turns on tab capture, which should cause
   // the indicator to turn on.
   AddExtensionToCommandLineWhitelist();
   ASSERT_TRUE(RunExtensionSubtest("tab_capture", "start_tab_capture.html"))
       << message_;
@@ skipping 37 matching lines @@
       return;
     }
     content::RunMessageLoop();
   }
   browser()->tab_strip_model()->RemoveObserver(&observer);
 }
 
 }  // namespace
 
 }  // namespace extensions