media: Allow config change between clear and encrypted streams

chrome/browser/media/media_browsertest.cc

 // Copyright 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 "chrome/browser/media/media_browsertest.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "media/base/test_data_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
+namespace chrome {
+
+// TODO(sandersd): Change the tests to use a more unique message.
+// See http://crbug.com/592067
+
 // Normal failure title.
 const char MediaBrowserTest::kFailed[] = "FAILED";
 
-// Capitalized event name set by Utils.installTitleEventHandler().
+// Upper case event name set by Utils.installTitleEventHandler().
 const char MediaBrowserTest::kEnded[] = "ENDED";
 
-// Uncapitalized event name as set by Utils.failTest().
-// TODO(sandersd): Change the tests to use a more unique message.
+// Lower case event name as set by Utils.failTest().
 const char MediaBrowserTest::kError[] = "error";
 
 MediaBrowserTest::MediaBrowserTest() : ignore_plugin_crash_(false) {}
 
 MediaBrowserTest::~MediaBrowserTest() {}
 
 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page,
                                         const base::StringPairs& query_params,
                                         const std::string& expected_title,
                                         bool http) {
@@ skipping 40 matching lines @@
                                      base::ProcessId plugin_pid) {
   DVLOG(0) << "Plugin crashed: " << plugin_path.value();
   if (ignore_plugin_crash_)
     return;
   ADD_FAILURE() << "Failing test due to plugin crash.";
 }
 
 void MediaBrowserTest::IgnorePluginCrash() {
   ignore_plugin_crash_ = true;
 }
+
+}  // namespace chrome