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

content/browser/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/string16.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/shell.h"
 #include "content/test/layout_browsertest.h"
 #include "content/test/content_browser_test_utils.h"
 #include "googleurl/src/gurl.h"
 
-namespace content {
-
 // Tests playback and seeking of an audio or video file over file or http based
 // on a test parameter.  Test starts with playback, then, after X seconds or the
 // ended event fires, seeks near end of file; see player.html for details.  The
 // test completes when either the last 'ended' or an 'error' event fires.
-class MediaTest : public testing::WithParamInterface<bool>,
-                  public ContentBrowserTest {
+class MediaTest
+    : public testing::WithParamInterface<bool>,
+      public content::ContentBrowserTest {
  public:
   // Play specified audio over http:// or file:// depending on |http| setting.
   void PlayAudio(const char* media_file, bool http) {
     ASSERT_NO_FATAL_FAILURE(PlayMedia("audio", media_file, http));
   }
 
   // Play specified video over http:// or file:// depending on |http| setting.
   void PlayVideo(const char* media_file, bool http) {
     ASSERT_NO_FATAL_FAILURE(PlayMedia("video", media_file, http));
   }
 
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // TODO(dalecurtis): Not all Buildbots have viable audio devices, so disable
     // audio to prevent tests from hanging; e.g., a device which is hardware
     // muted.  See http://crbug.com/120749
     command_line->AppendSwitch(switches::kDisableAudio);
   }
 
  private:
   GURL GetTestURL(const char* tag, const char* media_file, bool http) {
     if (http) {
       return test_server()->GetURL(
           base::StringPrintf("files/media/player.html?%s=%s", tag, media_file));
     }
 
-    FilePath test_file_path = GetTestFilePath("media", "player.html");
+    FilePath test_file_path = content::GetTestFilePath("media", "player.html");
     std::string query = base::StringPrintf("%s=%s", tag, media_file);
-    return GetFileUrlWithQuery(test_file_path, query);
+    return content::GetFileUrlWithQuery(test_file_path, query);
   }
 
   void PlayMedia(const char* tag, const char* media_file, bool http) {
     if (http)
       ASSERT_TRUE(test_server()->Start());
 
     GURL player_gurl = GetTestURL(tag, media_file, http);
 
     // Allow the media file to be loaded.
     const string16 kEnded = ASCIIToUTF16("ENDED");
     const string16 kError = ASCIIToUTF16("ERROR");
     const string16 kFailed = ASCIIToUTF16("FAILED");
-    TitleWatcher title_watcher(shell()->web_contents(), kEnded);
+    content::TitleWatcher title_watcher(shell()->web_contents(), kEnded);
     title_watcher.AlsoWaitForTitle(kFailed);
     title_watcher.AlsoWaitForTitle(kError);
 
-    NavigateToURL(shell(), player_gurl);
+    content::NavigateToURL(shell(), player_gurl);
 
     string16 final_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(kEnded, final_title);
   }
 };
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearTheora) {
   PlayVideo("bear.ogv", GetParam());
 }
 
@@ skipping 104 matching lines @@
   RunLayoutTest("video-autoplay.html");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) {
   RunLayoutTest("video-loop.html");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) {
   RunLayoutTest("video-no-autoplay.html");
 }
-
-}  // namespace content