Revert 164120 - content/browser: Move more files into the content namespace.

content/browser/encrypted_media_browsertest.cc

Index: content/browser/encrypted_media_browsertest.cc
===================================================================
--- content/browser/encrypted_media_browsertest.cc	(revision 164121)
+++ content/browser/encrypted_media_browsertest.cc	(working copy)
@@ -18,23 +18,24 @@
 #include "googleurl/src/gurl.h"
 #include "webkit/media/crypto/key_systems.h"
 
-namespace content {
-
 // Platform-specific filename relative to the chrome executable.
 #if defined(OS_WIN)
-const wchar_t kLibraryName[] = L"clearkeycdmplugin.dll";
+static const wchar_t kLibraryName[] = L"clearkeycdmplugin.dll";
 #elif defined(OS_MACOSX)
-const char kLibraryName[] = "clearkeycdmplugin.plugin";
+static const char kLibraryName[] = "clearkeycdmplugin.plugin";
 #elif defined(OS_POSIX)
-const char kLibraryName[] = "libclearkeycdmplugin.so";
+static const char kLibraryName[] = "libclearkeycdmplugin.so";
 #endif
 
 // Available key systems.
-const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
-const char kExternalClearKeyKeySystem[] = "org.chromium.externalclearkey";
+static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
+static const char kExternalClearKeyKeySystem[] =
+    "org.chromium.externalclearkey";
 
-class EncryptedMediaTest : public testing::WithParamInterface<const char*>,
-                           public ContentBrowserTest {
+
+class EncryptedMediaTest
+    : public testing::WithParamInterface<const char*>,
+      public content::ContentBrowserTest {
  public:
   void TestSimplePlayback(const char* encrypted_video, const char* key_system,
                           const string16 expectation) {
@@ -58,18 +59,18 @@
     GURL player_gurl = test_server()->GetURL(base::StringPrintf(
         "files/media/%s?keysystem=%s&mediafile=%s", html_page, key_system,
         media_file));
-    TitleWatcher title_watcher(shell()->web_contents(), expectation);
+    content::TitleWatcher title_watcher(shell()->web_contents(), expectation);
     title_watcher.AlsoWaitForTitle(kError);
     title_watcher.AlsoWaitForTitle(kFailed);
 
-    NavigateToURL(shell(), player_gurl);
+    content::NavigateToURL(shell(), player_gurl);
 
     string16 final_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expectation, final_title);
 
     if (final_title == kFailed) {
       std::string fail_message;
-      EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
+      EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString(
           shell()->web_contents()->GetRenderViewHost(), L"",
           L"window.domAutomationController.send(failMessage);", &fail_message));
       LOG(INFO) << "Test failed: " << fail_message;
@@ -129,5 +130,3 @@
 INSTANTIATE_TEST_CASE_P(ExternalClearKey, EncryptedMediaTest,
                         ::testing::Values(kExternalClearKeyKeySystem));
 #endif
-
-}  // namespace content