Mac Sandbox: Clean up forward declaration of internal sandbox functions.

chrome/common/sandbox_mac_unittest_helper.mm

 // Copyright (c) 2010 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 "chrome/common/sandbox_mac_unittest_helper.h"
 
 extern "C" {
 #include <sandbox.h>
 }
 
 #include <map>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/sandbox_mac.h"
 #include "testing/multiprocess_func_list.h"
 
+using sandbox::Sandbox;
+
 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 {
 
@@ skipping 16 matching lines @@
   }
   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>(sandbox::SANDBOX_TYPE_FIRST_TYPE);
-      i < sandbox::SANDBOX_AFTER_TYPE_LAST_TYPE;
+  for(int i = static_cast<int>(Sandbox::SANDBOX_TYPE_FIRST_TYPE);
+      i < Sandbox::SANDBOX_AFTER_TYPE_LAST_TYPE;
       ++i) {
-    if (!RunTestInSandbox(static_cast<sandbox::SandboxProcessType>(i),
+    if (!RunTestInSandbox(static_cast<Sandbox::SandboxProcessType>(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(sandbox::SandboxProcessType sandbox_type,
+bool MacSandboxTest::RunTestInSandbox(Sandbox::SandboxProcessType 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 29 matching lines @@
 
 // Main function for driver process that enables the sandbox and runs test
 // code.
 MULTIPROCESS_TEST_MAIN(mac_sandbox_test_runner) {
   // Extract parameters.
   char* sandbox_type_str = getenv(kSandboxTypeKey);
   if (!sandbox_type_str) {
     LOG(ERROR) << "Sandbox type not specified";
     return -1;
   }
-  sandbox::SandboxProcessType sandbox_type =
-      static_cast<sandbox::SandboxProcessType>(atoi(sandbox_type_str));
+  Sandbox::SandboxProcessType sandbox_type =
+      static_cast<Sandbox::SandboxProcessType>(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));
   if (!test_case.get()) {
     LOG(ERROR) << "Invalid sandbox test name (" << sandbox_test_name << ")";
     return -1;
   }
   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::SandboxWarmup();
 
-  if (!sandbox::EnableSandbox(sandbox_type, FilePath())) {
+  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