Move sandbox code in content to content namespace.

content/common/sandbox_mac_unittest_helper.mm

 // Copyright (c) 2011 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/common/sandbox_mac_unittest_helper.h"
 
 extern "C" {
 #include <sandbox.h>
 }
 
 #include <map>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/sandbox_mac.h"
 #include "content/test/test_content_client.h"
 #include "testing/multiprocess_func_list.h"
 
-using sandbox::Sandbox;
-
+namespace content {
 namespace {
 
 const char* kSandboxTypeKey = "CHROMIUM_SANDBOX_SANDBOX_TYPE";
 const char* kSandboxTestNameKey = "CHROMIUM_SANDBOX_TEST_NAME";
 const char* kTestDataKey = "CHROMIUM_SANDBOX_USER_DATA";
 
 }  // namespace
 
-namespace sandboxtest {
-
 // Support infrastructure for REGISTER_SANDBOX_TEST_CASE macro.
 namespace internal {
 
 typedef std::map<std::string,MacSandboxTestCase*> SandboxTestMap;
 
 // A function that returns a common map from string -> test case class.
 SandboxTestMap& GetSandboxTestMap() {
   static SandboxTestMap test_map;
   return test_map;
 }
 
 void AddSandboxTestCase(const char* test_name, MacSandboxTestCase* test_class) {
   SandboxTestMap& test_map = GetSandboxTestMap();
   if (test_map.find(test_name) != test_map.end()) {
     LOG(ERROR) << "Trying to register duplicate test" << test_name;
     NOTREACHED();
   }
   test_map[test_name] = test_class;
 }
 
 }  // namespace internal
 
 bool MacSandboxTest::RunTestInAllSandboxTypes(const char* test_name,
                                               const char* test_data) {
   // Go through all the sandbox types, and run the test case in each of them
   // if one fails, abort.
-  for(int i = static_cast<int>(content::SANDBOX_TYPE_FIRST_TYPE);
-      i < content::SANDBOX_TYPE_AFTER_LAST_TYPE;
+  for(int i = static_cast<int>(SANDBOX_TYPE_FIRST_TYPE);
+      i < SANDBOX_TYPE_AFTER_LAST_TYPE;
       ++i) {
 
-    if (!RunTestInSandbox(static_cast<content::SandboxType>(i),
+    if (!RunTestInSandbox(static_cast<SandboxType>(i),
             test_name, test_data)) {
       LOG(ERROR) << "Sandboxed test (" << test_name << ")" <<
           "Failed in sandbox type " << i <<
           "user data: (" << test_data << ")";
       return false;
     }
   }
  return true;
 }
 
-bool MacSandboxTest::RunTestInSandbox(content::SandboxType sandbox_type,
+bool MacSandboxTest::RunTestInSandbox(SandboxType sandbox_type,
                                       const char* test_name,
                                       const char* test_data) {
   std::stringstream s;
   s << static_cast<int>(static_cast<int>(sandbox_type));
   setenv(kSandboxTypeKey, s.str().c_str(), 1);
   setenv(kSandboxTestNameKey, test_name, 1);
   if (test_data)
     setenv(kTestDataKey, test_data, 1);
 
   base::ProcessHandle child_process = SpawnChild("mac_sandbox_test_runner",
@@ skipping 28 matching lines @@
 
   SandboxTestMap::iterator it = all_tests.find(name);
   if (it == all_tests.end()) {
     LOG(ERROR) << "Couldn't find sandbox test case(" << name << ")";
     return NULL;
   }
 
   return it->second;
 }
 
-}  // namespace sandboxtest
-
-namespace {
-
 // Main function for driver process that enables the sandbox and runs test
 // code.
 MULTIPROCESS_TEST_MAIN(mac_sandbox_test_runner) {
   TestContentClient content_client;
-  content::SetContentClient(&content_client);
+  SetContentClient(&content_client);
   // Extract parameters.
   char* sandbox_type_str = getenv(kSandboxTypeKey);
   if (!sandbox_type_str) {
     LOG(ERROR) << "Sandbox type not specified";
     return -1;
   }
-  content::SandboxType sandbox_type =
-      static_cast<content::SandboxType>(atoi(sandbox_type_str));
+  SandboxType sandbox_type = static_cast<SandboxType>(atoi(sandbox_type_str));
   char* sandbox_test_name = getenv(kSandboxTestNameKey);
   if (!sandbox_test_name) {
     LOG(ERROR) << "Sandbox test name not specified";
     return -1;
   }
 
   const char* test_data = getenv(kTestDataKey);
 
   // Find Test Function to run;
-  scoped_ptr<sandboxtest::MacSandboxTestCase>
-      test_case(sandboxtest::SandboxTestForName(sandbox_test_name));
+  scoped_ptr<MacSandboxTestCase>
+      test_case(SandboxTestForName(sandbox_test_name));
   if (!test_case.get()) {
     LOG(ERROR) << "Invalid sandbox test name (" << sandbox_test_name << ")";
     return -1;
   }
   if (test_data)
     test_case->SetTestData(test_data);
 
   // Run Test.
   if (!test_case->BeforeSandboxInit()) {
     LOG(ERROR) << sandbox_test_name << "Failed test before sandbox init";
     return -1;
   }
 
   Sandbox::SandboxWarmup(sandbox_type);
 
   if (!Sandbox::EnableSandbox(sandbox_type, FilePath())) {
     LOG(ERROR) << "Failed to initialize sandbox " << sandbox_type;
     return -1;
   }
 
   if (!test_case->SandboxedTest()) {
     LOG(ERROR) << sandbox_test_name << "Failed sandboxed test";
     return -1;
   }
 
   return 0;
 }
 
-}  // namespace
+}  // namespace content