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

content/browser/encrypted_media_browsertest.cc

 // Copyright (c) 2012 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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/shell.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
 #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) {
     PlayEncryptedMedia("encrypted_media_player.html", encrypted_video,
                        key_system, expectation);
   }
 
   void TestFrameSizeChange(const char* key_system, const string16 expectation) {
     PlayEncryptedMedia("encrypted_frame_size_change.html",
                        "frame_size_change-av-enc-v.webm", key_system,
                        expectation);
   }
 
   void PlayEncryptedMedia(const char* html_page, const char* media_file,
                           const char* key_system, const string16 expectation) {
     // TODO(shadi): Add non-HTTP tests once src is supported for EME.
     ASSERT_TRUE(test_server()->Start());
 
     const string16 kError = ASCIIToUTF16("ERROR");
     const string16 kFailed = ASCIIToUTF16("FAILED");
     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;
     }
   }
 
  protected:
   // Registers any CDM plugins not registered by default.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(switches::kDisableAudio);
@@ skipping 39 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest,
                         ::testing::Values(kClearKeyKeySystem));
 
 // http://crbug.com/152864 (Mac) and http://crbug.com/157759 (ASAN on Aura)
 #if !defined(OS_MACOSX) && !(defined(ADDRESS_SANITIZER) && defined(USE_AURA))
 INSTANTIATE_TEST_CASE_P(ExternalClearKey, EncryptedMediaTest,
                         ::testing::Values(kExternalClearKeyKeySystem));
 #endif
-
-}  // namespace content