Simplify how Content*Client interfaces are created. Instead of depending on the embedder to know wh…

chrome/app/chrome_main_delegate.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 "chrome/app/chrome_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
@@ skipping 237 matching lines @@
 // Enable the heap profiler if the appropriate command-line switch is
 // present, bailing out of the app we can't.
 void EnableHeapProfiler(const CommandLine& command_line) {
 #if defined(OS_WIN)
   if (command_line.HasSwitch(switches::kMemoryProfiling))
     if (!LoadMemoryProfiler())
       exit(-1);
 #endif
 }
 
-void InitializeChromeContentRendererClient() {
-  content::GetContentClient()->set_renderer(
-      &g_chrome_content_renderer_client.Get());
-}
-
-void InitializeChromeContentClient(const std::string& process_type) {
-  if (process_type.empty()) {
-    content::GetContentClient()->set_browser(
-        &g_chrome_content_browser_client.Get());
-  } else if (process_type == switches::kPluginProcess) {
-    content::GetContentClient()->set_plugin(
-        &g_chrome_content_plugin_client.Get());
-  } else if (process_type == switches::kRendererProcess) {
-    InitializeChromeContentRendererClient();
-  } else if (process_type == switches::kUtilityProcess) {
-    content::GetContentClient()->set_utility(
-        &g_chrome_content_utility_client.Get());
-  }
-}
-
 // Returns true if this subprocess type needs the ResourceBundle initialized
 // and resources loaded.
 bool SubprocessNeedsResourceBundle(const std::string& process_type) {
   return
 #if defined(OS_WIN) || defined(OS_MACOSX)
       // Windows needs resources for the default/null plugin.
       // Mac needs them for the plugin process name.
       process_type == switches::kPluginProcess ||
 #endif
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ skipping 152 matching lines @@
     *exit_code = 1;
     return true;
   }
 #endif
 
   if (!command_line.HasSwitch(switches::kProcessType) &&
       command_line.HasSwitch(switches::kEnableBenchmarking)) {
     base::FieldTrial::EnableBenchmarking();
   }
 
-  std::string process_type =  command_line.GetSwitchValueASCII(
-      switches::kProcessType);
   content::SetContentClient(&chrome_content_client_);
-  InitializeChromeContentClient(process_type);
 
   return false;
 }
 
 #if defined(OS_MACOSX)
 void ChromeMainDelegate::InitMacCrashReporter(const CommandLine& command_line,
                                               const std::string& process_type) {
   // TODO(mark): Right now, InitCrashReporter() needs to be called after
   // CommandLine::Init() and chrome::RegisterPathProvider().  Ideally,
   // Breakpad initialization could occur sooner, preferably even before the
@@ skipping 113 matching lines @@
   startup_timer_.reset(new base::StatsScope<base::StatsCounterTimer>
                        (stats_counter_timer));
 
   // Enable the heap profiler as early as possible!
   EnableHeapProfiler(command_line);
 
   // Enable Message Loop related state asap.
   if (command_line.HasSwitch(switches::kMessageLoopHistogrammer))
     MessageLoop::EnableHistogrammer(true);
 
-  if (command_line.HasSwitch(switches::kSingleProcess))
-    InitializeChromeContentRendererClient();
-
   logging::OldFileDeletionState file_state =
       logging::APPEND_TO_OLD_LOG_FILE;
   if (process_type.empty()) {
     file_state = logging::DELETE_OLD_LOG_FILE;
   }
   logging::InitChromeLogging(command_line, file_state);
 
 #if defined(OS_WIN)
   // TODO(darin): Kill this once http://crbug.com/52609 is fixed.
   ui::SetResourcesDataDLL(_AtlBaseModule.GetResourceInstance());
@@ skipping 109 matching lines @@
 #elif defined(OS_POSIX)
 content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() {
 #if defined(DISABLE_NACL)
   return NULL;
 #else
   return new NaClForkDelegate();
 #endif
 }
 
 void ChromeMainDelegate::ZygoteForked() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  std::string process_type =
-      command_line.GetSwitchValueASCII(switches::kProcessType);
-
   Profiling::ProcessStarted();
   if (Profiling::BeingProfiled()) {
     base::debug::RestartProfilingAfterFork();
     SetUpProfilingShutdownHandler();
   }
 
 #if defined(USE_LINUX_BREAKPAD)
   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
   // this up for the browser process in a different manner.
   InitCrashReporter();
 #endif
+}
 
-  InitializeChromeContentClient(process_type);
+#endif  // OS_MACOSX
+
+content::ContentBrowserClient*
+    ChromeMainDelegate::CreateContentBrowserClient() {
+  return &g_chrome_content_browser_client.Get();
 }
-#endif  // OS_MACOSX
+
+content::ContentPluginClient* ChromeMainDelegate::CreateContentPluginClient() {
+  return &g_chrome_content_plugin_client.Get();
+}
+
+content::ContentRendererClient*
+    ChromeMainDelegate::CreateContentRendererClient() {
+  return &g_chrome_content_renderer_client.Get();
+}
+
+content::ContentUtilityClient*
+    ChromeMainDelegate::CreateContentUtilityClient() {
+  return &g_chrome_content_utility_client.Get();
+}