media: Allow config change between clear and encrypted streams

content/browser/media/media_browsertest.cc

Index: content/browser/media/media_browsertest.cc
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index 1bfb71e792b3768d5963a7dcf70e8290f5acb13a..a3429291e836214d786c54b89c358084aae39ad9 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -19,11 +19,20 @@
 
 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::kEnded[] = "ENDED";
-const char MediaBrowserTest::kError[] = "ERROR";
 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::kErrorEvent[] = "ERROR";
+
 void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
   command_line->AppendSwitch(
       switches::kDisableGestureRequirementForMediaPlayback);
@@ -64,6 +73,7 @@ std::string MediaBrowserTest::RunTest(const GURL& gurl,
 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));
 }