Move the ProcessType enum out to its own file. This is in preparation for getting rid of ChildPro...

content/common/sandbox_policy.cc

 // 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_policy.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/win/windows_version.h"
-#include "content/common/child_process_info.h"
 #include "content/common/debug_flags.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/process_type.h"
 #include "sandbox/src/sandbox.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 static sandbox::BrokerServices* g_broker_services = NULL;
 
 namespace {
 
 // The DLLs listed here are known (or under strong suspicion) of causing crashes
 // when they are loaded in the renderer. Note: at runtime we generate short
 // versions of the dll name only if the dll has an extension.
@@ skipping 344 matching lines @@
   DCHECK(broker_services);
   DCHECK(!g_broker_services);
   broker_services->Init();
   g_broker_services = broker_services;
 }
 
 base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
                                            const FilePath& exposed_dir) {
   base::ProcessHandle process = 0;
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
-  ChildProcessInfo::ProcessType type;
+  content::ProcessType type;
   std::string type_str = cmd_line->GetSwitchValueASCII(switches::kProcessType);
   if (type_str == switches::kRendererProcess) {
-    type = ChildProcessInfo::RENDER_PROCESS;
+    type = content::PROCESS_TYPE_RENDERER;
   } else if (type_str == switches::kPluginProcess) {
-    type = ChildProcessInfo::PLUGIN_PROCESS;
+    type = content::PROCESS_TYPE_PLUGIN;
   } else if (type_str == switches::kWorkerProcess) {
-    type = ChildProcessInfo::WORKER_PROCESS;
+    type = content::PROCESS_TYPE_WORKER;
   } else if (type_str == switches::kNaClLoaderProcess) {
-    type = ChildProcessInfo::NACL_LOADER_PROCESS;
+    type = content::PROCESS_TYPE_NACL_LOADER;
   } else if (type_str == switches::kUtilityProcess) {
-    type = ChildProcessInfo::UTILITY_PROCESS;
+    type = content::PROCESS_TYPE_UTILITY;
   } else if (type_str == switches::kNaClBrokerProcess) {
-    type = ChildProcessInfo::NACL_BROKER_PROCESS;
+    type = content::PROCESS_TYPE_NACL_BROKER;
   } else if (type_str == switches::kGpuProcess) {
-    type = ChildProcessInfo::GPU_PROCESS;
+    type = content::PROCESS_TYPE_GPU;
   } else if (type_str == switches::kPpapiPluginProcess) {
-    type = ChildProcessInfo::PPAPI_PLUGIN_PROCESS;
+    type = content::PROCESS_TYPE_PPAPI_PLUGIN;
   } else if (type_str == switches::kPpapiBrokerProcess) {
-    type = ChildProcessInfo::PPAPI_BROKER_PROCESS;
+    type = content::PROCESS_TYPE_PPAPI_BROKER;
   } else {
     NOTREACHED();
     return 0;
   }
 
   TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess", 0, type_str);
 
   // To decide if the process is going to be sandboxed we have two cases.
   // First case: all process types except the nacl broker, and the plugin
   // process are sandboxed by default.
   bool in_sandbox =
-      (type != ChildProcessInfo::NACL_BROKER_PROCESS) &&
-      (type != ChildProcessInfo::PLUGIN_PROCESS) &&
-      (type != ChildProcessInfo::PPAPI_BROKER_PROCESS);
+      (type != content::PROCESS_TYPE_NACL_BROKER) &&
+      (type != content::PROCESS_TYPE_PLUGIN) &&
+      (type != content::PROCESS_TYPE_PPAPI_BROKER);
 
   // If it is the GPU process then it can be disabled by a command line flag.
-  if ((type == ChildProcessInfo::GPU_PROCESS) &&
+  if ((type == content::PROCESS_TYPE_GPU) &&
       (browser_command_line.HasSwitch(switches::kDisableGpuSandbox))) {
     in_sandbox = false;
     DVLOG(1) << "GPU sandbox is disabled";
   }
 
   if (browser_command_line.HasSwitch(switches::kNoSandbox) ||
       cmd_line->HasSwitch(switches::kNoSandbox)) {
     // The user or the caller has explicity opted-out from all sandboxing.
     in_sandbox = false;
   }
@@ skipping 24 matching lines @@
   // Prefetch hints on windows:
   // Using a different prefetch profile per process type will allow Windows
   // to create separate pretetch settings for browser, renderer etc.
   cmd_line->AppendArg(base::StringPrintf("/prefetch:%d", type));
 
   sandbox::ResultCode result;
   PROCESS_INFORMATION target = {0};
   sandbox::TargetPolicy* policy = g_broker_services->CreatePolicy();
 
 #if !defined(NACL_WIN64)  // We don't need this code on win nacl64.
-  if (type == ChildProcessInfo::PLUGIN_PROCESS &&
+  if (type == content::PROCESS_TYPE_PLUGIN &&
       !browser_command_line.HasSwitch(switches::kNoSandbox) &&
       content::GetContentClient()->SandboxPlugin(cmd_line, policy)) {
     in_sandbox = true;
   }
 #endif
 
   if (!in_sandbox) {
     policy->Release();
     base::LaunchProcess(*cmd_line, base::LaunchOptions(), &process);
     return process;
   }
 
-  if (type == ChildProcessInfo::PLUGIN_PROCESS) {
+  if (type == content::PROCESS_TYPE_PLUGIN) {
     AddGenericDllEvictionPolicy(policy);
     AddPluginDllEvictionPolicy(policy);
-  } else if (type == ChildProcessInfo::GPU_PROCESS) {
+  } else if (type == content::PROCESS_TYPE_GPU) {
     if (!AddPolicyForGPU(cmd_line, policy))
       return 0;
-  } else if (type == ChildProcessInfo::PPAPI_PLUGIN_PROCESS) {
+  } else if (type == content::PROCESS_TYPE_PPAPI_PLUGIN) {
     if (!AddPolicyForPepperPlugin(policy))
       return 0;
   } else {
     AddPolicyForRenderer(policy);
     // TODO(jschuh): Need get these restrictions applied to NaCl and Pepper.
     // Just have to figure out what needs to be warmed up first.
-    if (type == ChildProcessInfo::RENDER_PROCESS ||
-        type == ChildProcessInfo::WORKER_PROCESS) {
+    if (type == content::PROCESS_TYPE_RENDERER ||
+        type == content::PROCESS_TYPE_WORKER) {
       AddBaseHandleClosePolicy(policy);
     }
 
     if (type_str != switches::kRendererProcess) {
       // Hack for Google Desktop crash. Trick GD into not injecting its DLL into
       // this subprocess. See
       // http://code.google.com/p/chromium/issues/detail?id=25580
       cmd_line->AppendSwitchASCII("ignored", " --type=renderer ");
     }
   }
@@ skipping 32 matching lines @@
     DLOG(ERROR) << "Failed to launch process. Error: " << result;
     return 0;
   }
 
   // For Native Client sel_ldr processes on 32-bit Windows, reserve 1 GB of
   // address space to prevent later failure due to address space fragmentation
   // from .dll loading. The NaCl process will attempt to locate this space by
   // scanning the address space using VirtualQuery.
   // TODO(bbudge) Handle the --no-sandbox case.
   // http://code.google.com/p/nativeclient/issues/detail?id=2131
-  if (type == ChildProcessInfo::NACL_LOADER_PROCESS &&
+  if (type == content::PROCESS_TYPE_NACL_LOADER &&
       (base::win::OSInfo::GetInstance()->wow64_status() ==
           base::win::OSInfo::WOW64_DISABLED)) {
     const SIZE_T kOneGigabyte = 1 << 30;
     void *nacl_mem = VirtualAllocEx(target.hProcess,
                                     NULL,
                                     kOneGigabyte,
                                     MEM_RESERVE,
                                     PAGE_NOACCESS);
     if (!nacl_mem) {
       DLOG(WARNING) << "Failed to reserve address space for Native Client";
     }
   }
 
   ResumeThread(target.hThread);
   CloseHandle(target.hThread);
   process = target.hProcess;
 
   // Help the process a little. It can't start the debugger by itself if
   // the process is in a sandbox.
   if (child_needs_help)
     base::debug::SpawnDebuggerOnProcess(target.dwProcessId);
 
   return process;
 }
 
 }  // namespace sandbox