Start moving code from BrowserMain to content, so that it can be reused by all embedders of conte...

chrome/app/chrome_main.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 "chrome/app/chrome_main.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
-#include "base/metrics/stats_table.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/stringprintf.h"
-#include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/diagnostics/diagnostics_main.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_content_plugin_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/profiling.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/utility/chrome_content_utility_client.h"
 #include "content/app/content_main.h"
 #include "content/app/content_main_delegate.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/common/content_client.h"
 #include "content/common/content_counters.h"
 #include "content/common/content_paths.h"
-#include "ipc/ipc_switches.h"
 #include "media/base/media.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_WIN)
 #include <algorithm>
 #include <atlbase.h>
 #include <malloc.h>
 #include "base/string_util.h"
 #include "base/win/registry.h"
@@ skipping 35 matching lines @@
 #include <stdlib.h>
 #include <string.h>
 #include "ui/base/x/x11_util.h"
 #endif
 
 #if defined(USE_LINUX_BREAKPAD)
 #include "chrome/app/breakpad_linux.h"
 #endif
 
 #if !defined(NACL_WIN64)  // We don't build the this code on win nacl64.
+base::LazyInstance<chrome::ChromeContentBrowserClient>
+    g_chrome_content_browser_client(base::LINKER_INITIALIZED);
 base::LazyInstance<chrome::ChromeContentRendererClient>
     g_chrome_content_renderer_client(base::LINKER_INITIALIZED);
 base::LazyInstance<chrome::ChromeContentUtilityClient>
     g_chrome_content_utility_client(base::LINKER_INITIALIZED);
 #endif   // NACL_WIN64
 
 base::LazyInstance<chrome::ChromeContentPluginClient>
     g_chrome_content_plugin_client(base::LINKER_INITIALIZED);
 
-extern int BrowserMain(const MainFunctionParams&);
 extern int RendererMain(const MainFunctionParams&);
 extern int NaClMain(const MainFunctionParams&);
 extern int ProfileImportMain(const MainFunctionParams&);
 #if defined(_WIN64)
 extern int NaClBrokerMain(const MainFunctionParams&);
 #endif
 extern int ServiceProcessMain(const MainFunctionParams&);
 
 #if defined(OS_WIN)
 // TODO(erikkay): isn't this already defined somewhere?
@@ skipping 109 matching lines @@
 }
 
 void InitializeChromeContentRendererClient() {
 #if !defined(NACL_WIN64)  // We don't build the renderer code on win nacl64.
   content::GetContentClient()->set_renderer(
       &g_chrome_content_renderer_client.Get());
 #endif
 }
 
 void InitializeChromeContentClient(const std::string& process_type) {
-  if (process_type == switches::kPluginProcess) {
+  if (process_type.empty()) {
+#if !defined(NACL_WIN64)  // We don't build the this code on win nacl64.
+    content::GetContentClient()->set_browser(
+        &g_chrome_content_browser_client.Get());
+#endif
+  } else if (process_type == switches::kPluginProcess) {
     content::GetContentClient()->set_plugin(
         &g_chrome_content_plugin_client.Get());
   } else if (process_type == switches::kRendererProcess ||
              process_type == switches::kExtensionProcess) {
     InitializeChromeContentRendererClient();
   } else if (process_type == switches::kUtilityProcess) {
 #if !defined(NACL_WIN64)  // We don't build this code on win nacl64.
     content::GetContentClient()->set_utility(
         &g_chrome_content_utility_client.Get());
 #endif
@@ skipping 39 matching lines @@
     name_id = IDS_UTILITY_APP_NAME;
   }
   if (name_id) {
     NSString* app_name = l10n_util::GetNSString(name_id);
     base::mac::SetProcessName(base::mac::NSToCFCast(app_name));
   }
 }
 
 #endif  // defined(OS_MACOSX)
 
-void InitializeStatsTable(base::ProcessId browser_pid,
-                          const CommandLine& command_line) {
-  // Initialize the Stats Counters table.  With this initialized,
-  // the StatsViewer can be utilized to read counters outside of
-  // Chrome.  These lines can be commented out to effectively turn
-  // counters 'off'.  The table is created and exists for the life
-  // of the process.  It is not cleaned up.
-  if (command_line.HasSwitch(switches::kEnableStatsTable) ||
-      command_line.HasSwitch(switches::kEnableBenchmarking)) {
-    // NOTIMPLEMENTED: we probably need to shut this down correctly to avoid
-    // leaking shared memory regions on posix platforms.
-    std::string statsfile =
-        base::StringPrintf("%s-%u",
-                           chrome::kStatsFilename,
-                           static_cast<unsigned int>(browser_pid));
-    base::StatsTable *stats_table = new base::StatsTable(statsfile,
-        chrome::kStatsMaxThreads, chrome::kStatsMaxCounters);
-    base::StatsTable::set_current(stats_table);
-  }
-}
-
 #if defined(OS_POSIX)
 // Check for --version and --product-version; return true if we encountered
 // one of these switches and should exit now.
 bool HandleVersionSwitches(const CommandLine& command_line) {
   const chrome::VersionInfo version_info;
 
 #if !defined(OS_MACOSX)
   if (command_line.HasSwitch(switches::kProductVersion)) {
     printf("%s\n", version_info.Version().c_str());
     return true;
@@ skipping 188 matching lines @@
     InitMacCrashReporter(command_line, process_type);
 #endif
 
     // Notice a user data directory override if any
     FilePath user_data_dir =
         command_line.GetSwitchValuePath(switches::kUserDataDir);
     chrome_main::CheckUserDataDirPolicy(&user_data_dir);
     if (!user_data_dir.empty())
       CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir));
 
-    base::ProcessId browser_pid = base::GetCurrentProcId();
-    if (!process_type.empty() &&
-#if defined(OS_MACOSX)
-        process_type != switches::kRelauncherProcess &&
-#endif
-        process_type != switches::kServiceProcess) {
-#if defined(OS_WIN) || defined(OS_MACOSX)
-      std::string channel_name =
-          command_line.GetSwitchValueASCII(switches::kProcessChannelID);
-
-      int browser_pid_int;
-      base::StringToInt(channel_name, &browser_pid_int);
-      browser_pid = static_cast<base::ProcessId>(browser_pid_int);
-      DCHECK_NE(browser_pid_int, 0);
-#elif defined(OS_POSIX)
-      // On linux, we're in the zygote here; so we need the parent process' id.
-      browser_pid = base::GetParentProcessId(base::GetCurrentProcId());
-#endif
-    }
-    InitializeStatsTable(browser_pid, command_line);
-
     startup_timer_.reset(new base::StatsScope<base::StatsCounterTimer>
         (content::Counters::chrome_main()));
 
     // 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);
 
@@ skipping 83 matching lines @@
     // AdjustLinuxOOMScore function too.
 #if defined(OS_LINUX)
     AdjustLinuxOOMScore(process_type);
 #endif
   }
 
   virtual int RunProcess(
       const std::string& process_type,
       const MainFunctionParams& main_function_params) OVERRIDE {
     static const MainFunction kMainFunctions[] = {
-      { "",                            BrowserMain },
       // An extension process is just a renderer process. We use a different
       // command line argument to differentiate crash reports.
       { switches::kExtensionProcess,   RendererMain },
       { switches::kServiceProcess,     ServiceProcessMain },
 #if defined(OS_MACOSX)
       // TODO(port): Use OOP profile import - http://crbug.com/22142 .
       { switches::kProfileImportProcess, ProfileImportMain },
       { switches::kRelauncherProcess,
             mac_relauncher::internal::RelauncherMain },
 #endif
@@ skipping 60 matching lines @@
 #else
     return new NaClForkDelegate();
 #endif
   }
 
   virtual void ZygoteForked() OVERRIDE {
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
     std::string process_type =
         command_line.GetSwitchValueASCII(switches::kProcessType);
 
-    // The StatsTable must be initialized in each process; we already
-    // initialized for the browser process, now we need to initialize
-    // within the new processes as well.
-    pid_t browser_pid = base::GetParentProcessId(
-        base::GetParentProcessId(base::GetCurrentProcId()));
-    InitializeStatsTable(browser_pid, command_line);
-
 #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
 
  private:
   chrome::ChromeContentClient chrome_content_client_;
   scoped_ptr<base::StatsScope<base::StatsCounterTimer> > startup_timer_;
 };
 
 }  // namespace
 
 #if defined(OS_WIN)
 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
                                  sandbox::SandboxInterfaceInfo* sandbox_info) {
   ChromeMainDelegate chrome_main_delegate;
   return content::ContentMain(instance, sandbox_info, &chrome_main_delegate);
 #elif defined(OS_POSIX)
 int ChromeMain(int argc, char** argv) {
   ChromeMainDelegate chrome_main_delegate;
   return content::ContentMain(argc, argv, &chrome_main_delegate);
 #endif
 }