Make Linux Breakpad initialization call to lsb_release asynchronous. Also wrap more...

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2009 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/browser/browser_main.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/field_trial.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/lazy_instance.h"
+#include "base/linux_util.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/system_monitor.h"
 #include "base/time.h"
 #include "base/tracked_objects.h"
 #include "base/values.h"
@@ skipping 34 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/net_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/net_module.h"
 #include "net/http/http_network_session.h"
 #include "net/socket/client_socket_pool_base.h"
 
 #if defined(OS_POSIX)
 // TODO(port): get rid of this include. It's used just to provide declarations
 // and stub definitions for classes we encouter during the porting effort.
-#include "chrome/common/temp_scaffolding_stubs.h"

[agl, 2009/09/23 20:53:15]

Make sure that the Mac tryservers are ok with this.

 #include <errno.h>
 #include <signal.h>
 #include <sys/resource.h>
 #endif
 
+#if defined(USE_LINUX_BREAKPAD)
+#include "chrome/app/breakpad_linux.h"
+#endif
+
 #if defined(OS_LINUX)
-#include "chrome/app/breakpad_linux.h"
+#include "chrome/common/gtk_util.h"
 #endif
 
 // TODO(port): several win-only methods have been pulled out of this, but
 // BrowserMain() as a whole needs to be broken apart so that it's usable by
 // other platforms. For now, it's just a stub. This is a serious work in
 // progress and should not be taken as an indication of a real refactoring.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
@@ skipping 17 matching lines @@
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/version.h"
 #include "net/base/net_util.h"
 #include "net/base/sdch_manager.h"
 #include "net/base/winsock_init.h"
 #include "net/http/http_network_layer.h"
 #include "printing/printed_document.h"
 #include "sandbox/src/sandbox.h"
 #endif  // defined(OS_WIN)
 
-#if defined(OS_LINUX)
-#include "chrome/common/gtk_util.h"
-#endif
-
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/views/chrome_views_delegate.h"
 #include "views/focus/accelerator_handler.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/external_cookie_handler.h"
 #endif
 
 namespace {
@@ skipping 97 matching lines @@
     ++it;
   }
 }
 #else
 // TODO(cpu): implement first run experience for other platforms.
 void AddFirstRunNewTabs(BrowserInit* browser_init,
                         const std::vector<std::wstring>& new_tabs) {
 }
 #endif
 
+#if defined(USE_LINUX_BREAKPAD)
+class GetLinuxDistroTask : public Task {
+ public:
+  explicit GetLinuxDistroTask() {}
+
+  virtual void Run() {
+    base::GetLinuxDistro();  // Initialize base::linux_distro if needed.
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(GetLinuxDistroTask);
+};
+#endif  // USE_LINUX_BREAKPAD
 }  // namespace
 
 // Main routine for running as the Browser process.
 int BrowserMain(const MainFunctionParams& parameters) {
   const CommandLine& parsed_command_line = parameters.command_line_;
   base::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_;
 
-#if defined(OS_LINUX)
-  // Needs to be called after we have chrome::DIR_USER_DATA.
-  if (!parsed_command_line.HasSwitch(switches::kGoogleInternalCrashReporting))
-    InitCrashReporter();
-#endif
-
   // WARNING: If we get a WM_ENDSESSION objects created on the stack here
   // are NOT deleted. If you need something to run during WM_ENDSESSION add it
   // to browser_shutdown::Shutdown or BrowserProcess::EndSession.
 
   // TODO(beng, brettw): someday, break this out into sub functions with well
   //                     defined roles (e.g. pre/post-profile startup, etc).
 
 #ifdef TRACK_ALL_TASK_OBJECTS
   // Start tracking the creation and deletion of Task instance.
   // This construction MUST be done before main_message_loop, so that it is
@@ skipping 71 matching lines @@
     // see bug #1292702).
     browser_process.reset(new FirstRunBrowserProcess(parsed_command_line));
     is_first_run = false;
   } else {
     browser_process.reset(new BrowserProcessImpl(parsed_command_line));
   }
 
   // BrowserProcessImpl's constructor should set g_browser_process.
   DCHECK(g_browser_process);
 
+#if defined(USE_LINUX_BREAKPAD)
+  // Needs to be called after we have chrome::DIR_USER_DATA and
+  // g_browser_process.
+  if (!parsed_command_line.HasSwitch(switches::kGoogleInternalCrashReporting)) {
+    g_browser_process->file_thread()->message_loop()->PostTask(FROM_HERE,
+        new GetLinuxDistroTask());
+    InitCrashReporter();
+  }
+#endif
+
 #if defined(OS_WIN)
   // IMPORTANT: This piece of code needs to run as early as possible in the
   // process because it will initialize the sandbox broker, which requires the
   // process to swap its window station. During this time all the UI will be
   // broken. This has to run before threads and windows are created.
   sandbox::BrokerServices* broker_services =
       parameters.sandbox_info_.BrokerServices();
   if (broker_services) {
     browser_process->InitBrokerServices(broker_services);
     if (!parsed_command_line.HasSwitch(switches::kNoSandbox)) {
@@ skipping 491 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }