Move remaining files in content\browser to 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"
@@ skipping 18 matching lines @@
 
 // Available key systems.
 static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
 static const char kExternalClearKeyKeySystem[] =
     "org.chromium.externalclearkey";
 
 static const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
 static const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\"";
 static const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\"";
 
+namespace content {
 
-class EncryptedMediaTest
-    : public testing::WithParamInterface<const char*>,
-      public content::ContentBrowserTest {
+class EncryptedMediaTest : public testing::WithParamInterface<const char*>,
+                           public ContentBrowserTest {
  public:
   void TestSimplePlayback(const char* encrypted_media, const char* media_type,
                           const char* key_system, const string16 expectation) {
     PlayEncryptedMedia("encrypted_media_player.html", encrypted_media,
                        media_type, 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", kWebMAudioVideo,
                        key_system, expectation);
   }
 
   void PlayEncryptedMedia(const char* html_page, const char* media_file,
                           const char* media_type, 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&mediatype=%s", html_page,
         key_system, media_file, media_type));
-    content::TitleWatcher title_watcher(shell()->web_contents(), expectation);
+    TitleWatcher title_watcher(shell()->web_contents(), expectation);
     title_watcher.AlsoWaitForTitle(kError);
     title_watcher.AlsoWaitForTitle(kFailed);
 
-    content::NavigateToURL(shell(), player_gurl);
+    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(content::ExecuteJavaScriptAndExtractString(
+      EXPECT_TRUE(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 75 matching lines @@
   const string16 kExpected = ASCIIToUTF16("ENDED");
   ASSERT_NO_FATAL_FAILURE(
       TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo,
                          GetParam(), kExpected));
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {
   const string16 kExpected = ASCIIToUTF16("ENDED");
   ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected));
 }
+
+}  // namespace content