Enable MediaSourceTest.* content_browsertests on Android.

Enable MediaSourceTest.* content_browsertests on Android.

Sprinkling a little command line flag magic reveals these tests actually pass!

BUG=243843
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=204634

[acolwell GONE FROM CHROMIUM, 2013-06-06 00:51:46]

lgtm

[gone, 2013-06-06 00:52:36]

lgtm

[commit-bot: I haz the power, 2013-06-06 17:32:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/scherkus@chromium.org/16034007/1

[commit-bot: I haz the power, 2013-06-06 17:32:20]

Failed to apply patch for content/browser/media/media_source_browsertest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/media/media_source_browsertest.cc
  Hunk #1 FAILED at 36.
  Hunk #2 succeeded at 44 with fuzz 1 (offset -38 lines).
  1 out of 2 hunks FAILED -- saving rejects to file
content/browser/media/media_source_browsertest.cc.rej

Patch:       content/browser/media/media_source_browsertest.cc
Index: content/browser/media/media_source_browsertest.cc
diff --git a/content/browser/media/media_source_browsertest.cc
b/content/browser/media/media_source_browsertest.cc
index
43525b2516fd1ed642133f27fd37b607b97643c8..f596a62cd1b7d65fb65b36a241a22b983add449f
100644
--- a/content/browser/media/media_source_browsertest.cc
+++ b/content/browser/media/media_source_browsertest.cc
@@ -36,6 +36,15 @@ class MediaSourceTest :  public ContentBrowserTest {
                 expectation));
   }
 
+#if defined(OS_ANDROID)
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    // TODO(scherkus): Remove after enabled by default http://crbug.com/233420
+    command_line->AppendSwitch(switches::kEnableWebKitMediaSource);
+    command_line->AppendSwitch(
+        switches::kDisableGestureRequirementForMediaPlayback);
+  }
+#endif
+
   void RunTest(const char* html_page, const char* media_file,
                const char* media_type, const string16 expectation) {
     ASSERT_TRUE(test_server()->Start());
@@ -82,4 +91,4 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest,
DISABLED_ConfigChangeVideo) {
       RunTest("mse_config_change.html", NULL, NULL, kEnded));
 }
 
-}  // namespace content
\ No newline at end of file
+}  // namespace content

[scherkus (not reviewing), 2013-06-06 17:53:42]

creis: OWNERS for content/public/common/content_switches.h

[Charlie Reis, 2013-06-06 18:01:06]

content/public/common/content_switches.h LGTM.

[commit-bot: I haz the power, 2013-06-06 18:05:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/scherkus@chromium.org/16034007/10001

[commit-bot: I haz the power, 2013-06-06 22:44:09]

Change committed as 204634