Move remaining content test code into the content namespace.

content/test/layout_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 "content/test/layout_browsertest.h"
 
 #include <sstream>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 21 matching lines @@
 #elif defined(OS_MACOSX)
 static const char kPlatformName[] = "chromium-mac";
 #elif defined(OS_LINUX)
 static const char kPlatformName[] = "chromium-linux";
 #elif defined(OS_OPENBSD)
 static const char kPlatformName[] = "chromium-openbsd";
 #else
 #error No known OS defined
 #endif
 
+namespace content {
 namespace {
 
 bool ReadExpectedResult(const FilePath& result_dir_path,
                         const std::string test_case_file_name,
                         std::string* expected_result_value) {
   FilePath expected_result_path(result_dir_path);
   expected_result_path = expected_result_path.AppendASCII(test_case_file_name);
   expected_result_path = expected_result_path.InsertBeforeExtension(
       FILE_PATH_LITERAL("-expected"));
   expected_result_path =
@@ skipping 16 matching lines @@
       port_(port) {
 }
 
 InProcessBrowserLayoutTest::~InProcessBrowserLayoutTest() {
   if (test_http_server_.get())
     CHECK(test_http_server_->Stop());
 }
 
 void InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture() {
   FilePath src_dir;
-  ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &src_dir));
+  ASSERT_TRUE(PathService::Get(DIR_LAYOUT_TESTS, &src_dir));
   FilePath absolute_parent_dir = src_dir.Append(test_parent_dir_);
   ASSERT_TRUE(file_util::DirectoryExists(absolute_parent_dir));
   layout_test_dir_ = absolute_parent_dir.Append(test_case_dir_);
   ASSERT_TRUE(file_util::DirectoryExists(layout_test_dir_));
 
   // Gets the file path to rebased expected result directory for the current
   // platform.
   //   $LayoutTestRoot/platform/chromium_***/...
   rebase_result_dir_ = src_dir.AppendASCII("platform");
   rebase_result_dir_ = rebase_result_dir_.AppendASCII(kPlatformName);
@@ skipping 28 matching lines @@
     ASSERT_TRUE(test_http_server_->Start());
   }
 }
 
 void InProcessBrowserLayoutTest::SetUpCommandLine(CommandLine* command_line) {
   command_line->AppendSwitch(switches::kDumpRenderTree);
   command_line->AppendSwitch(switches::kIgnoreCertificateErrors);
 }
 
 void InProcessBrowserLayoutTest::SetUpOnMainThread() {
-  test_controller_.reset(new content::WebKitTestController);
+  test_controller_.reset(new WebKitTestController);
 }
 
 void InProcessBrowserLayoutTest::RunLayoutTest(
     const std::string& test_case_file_name) {
   GURL url = net::FilePathToFileURL(
       layout_test_dir_.AppendASCII(test_case_file_name));
   RunLayoutTestInternal(test_case_file_name, url);
 }
 
 void InProcessBrowserLayoutTest::RunHttpLayoutTest(
     const std::string& test_case_file_name) {
   DCHECK(test_http_server_.get());
   GURL url(StringPrintf(
       "http://127.0.0.1:%d/%s/%s", port_, test_case_dir_.MaybeAsASCII().c_str(),
       test_case_file_name.c_str()));
   RunLayoutTestInternal(test_case_file_name, url);
 }
 
 void InProcessBrowserLayoutTest::RunLayoutTestInternal(
     const std::string& test_case_file_name, const GURL& url) {
   std::stringstream result;
-  scoped_ptr<content::WebKitTestResultPrinter> printer(
-      new content::WebKitTestResultPrinter(&result, NULL));
+  scoped_ptr<WebKitTestResultPrinter> printer(
+      new WebKitTestResultPrinter(&result, NULL));
   printer->set_capture_text_only(true);
   test_controller_->set_printer(printer.release());
 
   LOG(INFO) << "Navigating to URL " << url << " and blocking.";
   ASSERT_TRUE(test_controller_->PrepareForLayoutTest(url, false, ""));
   base::RunLoop run_loop;
   run_loop.Run();
   LOG(INFO) << "Navigation completed.";
   ASSERT_TRUE(test_controller_->ResetAfterLayoutTest());
 
@@ skipping 36 matching lines @@
   EXPECT_NE(-1, file_util::WriteFile(expected_filename,
                                      expected.c_str(),
                                      expected.size()));
   EXPECT_NE(-1, file_util::WriteFile(actual_filename,
                                      actual.c_str(),
                                      actual.size()));
   return StringPrintf("Wrote %"PRFilePath" %"PRFilePath,
                       expected_filename.value().c_str(),
                       actual_filename.value().c_str());
 }
+
+}  // namespace content