Move sandbox code in content to content namespace.

content/public/test/test_launcher.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/public/test/test_launcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 22 matching lines @@
 
 #if defined(OS_WIN)
 #include "base/base_switches.h"
 #include "content/common/sandbox_policy.h"
 #include "sandbox/win/src/sandbox_factory.h"
 #include "sandbox/win/src/sandbox_types.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
-namespace test_launcher {
+namespace content {
 
 namespace {
 
 // A multiplier for slow tests. We generally avoid multiplying
 // test timeouts by any constants. Here it is used as last resort
 // to implement the SLOW_ test prefix.
 const int kSlowTestTimeoutMultiplier = 5;
 
 // Tests with this prefix have a longer timeout, see above.
 const char kSlowTestPrefix[] = "SLOW_";
@@ skipping 604 matching lines @@
          command_line->HasSwitch(kLaunchAsBrowser);
 #else
   return false;
 #endif  // defined(OS_WIN) || defined(OS_LINUX)
 }
 
 int RunContentMain(int argc, char** argv,
                    TestLauncherDelegate* launcher_delegate) {
 #if defined(OS_WIN)
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
-  content::InitializeSandboxInfo(&sandbox_info);
-  scoped_ptr<content::ContentMainDelegate> chrome_main_delegate(
+  InitializeSandboxInfo(&sandbox_info);
+  scoped_ptr<ContentMainDelegate> chrome_main_delegate(
       launcher_delegate->CreateContentMainDelegate());
-  return content::ContentMain(GetModuleHandle(NULL),
-                              &sandbox_info,
-                              chrome_main_delegate.get());
+  return ContentMain(GetModuleHandle(NULL),
+                     &sandbox_info,
+                     chrome_main_delegate.get());
 #elif defined(OS_LINUX)
-  scoped_ptr<content::ContentMainDelegate> chrome_main_delegate(
+  scoped_ptr<ContentMainDelegate> chrome_main_delegate(
       launcher_delegate->CreateContentMainDelegate());
-  return content::ContentMain(argc,
-                              const_cast<const char**>(argv),
-                              chrome_main_delegate.get());
+  return ContentMain(argc, const_cast<const char**>(argv),
+                     chrome_main_delegate.get());
 #endif  // defined(OS_WIN)
   NOTREACHED();
   return 0;
 }
 
 int LaunchTests(TestLauncherDelegate* launcher_delegate,
                 int argc,
                 char** argv) {
   DCHECK(!g_launcher_delegate);
   g_launcher_delegate = launcher_delegate;
 
   CommandLine::Init(argc, argv);
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(kHelpFlag)) {
     PrintUsage();
     return 0;
   }
 
   if (command_line->HasSwitch(kSingleProcessTestsFlag) ||
       (command_line->HasSwitch(kSingleProcessTestsAndChromeFlag) &&
        command_line->HasSwitch(kGTestFilterFlag)) ||
       command_line->HasSwitch(kGTestListTestsFlag) ||
       command_line->HasSwitch(kGTestHelpFlag)) {
 #if defined(OS_WIN)
     if (command_line->HasSwitch(kSingleProcessTestsFlag)) {
       sandbox::SandboxInterfaceInfo sandbox_info;
-      content::InitializeSandboxInfo(&sandbox_info);
-      content::InitializeSandbox(&sandbox_info);
+      InitializeSandboxInfo(&sandbox_info);
+      InitializeSandbox(&sandbox_info);
     }
 #endif
     return launcher_delegate->RunTestSuite(argc, argv);
   }
 
   if (ShouldRunContentMain())
     return RunContentMain(argc, argv, launcher_delegate);
 
   base::AtExitManager at_exit;
 
@@ skipping 55 matching lines @@
     if (cycles != -1)
       cycles--;
   }
   return exit_code;
 }
 
 TestLauncherDelegate* GetCurrentTestLauncherDelegate() {
   return g_launcher_delegate;
 }
 
-}  // namespace test_launcher
+}  // namespace content