media: Allow config change between clear and encrypted streams

content/browser/media/media_browsertest.cc

 // Copyright (c) 2013 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 "content/browser/media/media_browsertest.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "media/base/media_switches.h"
 #include "media/base/test_data_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace content {
 
+// TODO(sandersd): Change the tests to use a more unique message.

[ddorwin, 2017/02/12 04:28:52]

How is this different from 32? Why doesn't 32 have the bug reference?

[xhwang, 2017/02/14 23:59:32]

Removed TODO on l.32.

+// See http://crbug.com/592067
+
 // Common test results.
+const char MediaBrowserTest::kFailed[] = "FAILED";
+
+// Uncapitalized event name as set by Utils.failTest().

[ddorwin, 2017/02/12 04:28:52]

nit: "Lower case"?

[xhwang, 2017/02/14 23:59:32]

Done.

+const char MediaBrowserTest::kError[] = "error";
+
+// Capitalized event name set by Utils.installTitleEventHandler().

[ddorwin, 2017/02/12 04:28:52]

nit: Upper case

[xhwang, 2017/02/14 23:59:32]

Done.

+// TODO(sandersd): Change the tests to use a more unique message.
 const char MediaBrowserTest::kEnded[] = "ENDED";
-const char MediaBrowserTest::kError[] = "ERROR";
-const char MediaBrowserTest::kFailed[] = "FAILED";
+const char MediaBrowserTest::kErrorEvent[] = "ERROR";
 
 void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
   command_line->AppendSwitch(
       switches::kDisableGestureRequirementForMediaPlayback);
   command_line->AppendSwitch(switches::kEnableVp9InMp4);
 }
 
 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page,
                                         const base::StringPairs& query_params,
                                         const std::string& expected_title,
@@ skipping 21 matching lines @@
                              base::ASCIIToUTF16(expected_title));
   AddTitlesToAwait(&title_watcher);
   NavigateToURL(shell(), gurl);
   base::string16 result = title_watcher.WaitAndGetTitle();
   return base::UTF16ToASCII(result);
 }
 
 void MediaBrowserTest::AddTitlesToAwait(content::TitleWatcher* title_watcher) {
   title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEnded));
   title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kError));
+  title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kErrorEvent));
   title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kFailed));
 }
 
 // Tests playback and seeking of an audio or video file over file or http based
 // on a test parameter.  Test starts with playback, then, after X seconds or the
 // ended event fires, seeks near end of file; see player.html for details.  The
 // test completes when either the last 'ended' or an 'error' event fires.
 class MediaTest : public testing::WithParamInterface<bool>,
                   public MediaBrowserTest {
  public:
@@ skipping 184 matching lines @@
 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
   PlayVideo("bear.webm", false);
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
   EXPECT_FALSE(shell()->web_contents()->IsCrashed());
 }
 
 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false));
 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true));
 
 }  // namespace content