Merge M52: "When HLS redirects are encountered recreate WebMediaPlayer."

content/browser/media/media_browsertest.h

Index: content/browser/media/media_browsertest.h
diff --git a/content/browser/media/media_browsertest.h b/content/browser/media/media_browsertest.h
index 180cc2c28e469fcc88f16a7d597f249d2069b7e5..a512c71cff2d01d135cd094d1a9003770f1e704f 100644
--- a/content/browser/media/media_browsertest.h
+++ b/content/browser/media/media_browsertest.h
@@ -24,6 +24,9 @@ class MediaBrowserTest : public ContentBrowserTest {
   static const char kError[];
   static const char kFailed[];
 
+  // ContentBrowserTest implementation.
+  void SetUpCommandLine(base::CommandLine* command_line) override;
+
   // Runs a html page with a list of URL query parameters.
   // If http is true, the test starts a local http test server to load the test
   // page, otherwise a local file URL is loaded inside the content shell.