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 d19bfe2cbcabcc373053be09a2490511474565c9..b831a9807299f6f5987265f55b727e212ff6f017 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -20,11 +20,19 @@
 
 namespace content {
 
+// TODO(sandersd): Change the tests to use a more unique message.
+// See http://crbug.com/592067
+
 // Common test results.
-const char MediaBrowserTest::kEnded[] = "ENDED";
-const char MediaBrowserTest::kError[] = "ERROR";
 const char MediaBrowserTest::kFailed[] = "FAILED";
 
+// Upper case event name set by Utils.installTitleEventHandler().
+const char MediaBrowserTest::kEnded[] = "ENDED";
+const char MediaBrowserTest::kErrorEvent[] = "ERROR";
+
+// Lower case event name as set by Utils.failTest().
+const char MediaBrowserTest::kError[] = "error";
+
 void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
   command_line->AppendSwitch(
       switches::kDisableGestureRequirementForMediaPlayback);
@@ -65,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));
 }