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

things in USE_LINUX_BREAKPAD while we're at it.

BUG=21782
TEST=Add time.sleep(10) to /usr/bin/lsb_release; starting Chrome should not take 10 seconds more.
Review URL: http://codereview.chromium.org/209042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27001 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 2 insertions, 13 deletions

diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc
index a9c11d7..6945a12 100644
--- a/chrome/app/breakpad_linux.cc
+++ b/chrome/app/breakpad_linux.cc
@@ -24,7 +24,6 @@
 #include "base/format_macros.h"
 #include "base/global_descriptors_posix.h"
 #include "base/json_writer.h"
-#include "base/linux_util.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/scoped_fd.h"
@@ -644,7 +643,6 @@ void InitCrashReporter() {
   if (process_type.empty()) {
     if (!(unattended || GoogleUpdateSettings::GetCollectStatsConsent()))
       return;
-    base::GetLinuxDistro();  // Initialize base::linux_distro if needed.
     EnableCrashDumping(unattended);
   } else if (process_type == switches::kRendererProcess ||
              process_type == switches::kZygoteProcess) {
diff --git a/chrome/app/breakpad_linux.h b/chrome/app/breakpad_linux.h
index 53f43a1..e7dfebb 100644
--- a/chrome/app/breakpad_linux.h
+++ b/chrome/app/breakpad_linux.h
@@ -9,7 +9,6 @@
 
 extern void InitCrashReporter();
 
-#if defined(USE_LINUX_BREAKPAD)
 static const size_t kMaxActiveURLSize = 1024;
 static const size_t kGuidSize = 32;  // 128 bits = 32 chars in hex.
 static const size_t kDistroSize = 128;
@@ -28,7 +27,6 @@ struct BreakpadInfo {
 };
 
 extern int HandleCrashDump(const BreakpadInfo& info);
-#endif  // defined(USE_LINUX_BREAKPAD)
 
 #if defined(GOOGLE_CHROME_BUILD)
 // Checks that the kernel's core filename pattern is "core" and moves the
diff --git a/chrome/app/breakpad_linux_stub.cc b/chrome/app/breakpad_linux_stub.cc
deleted file mode 100644
index 05c0166..0000000
--- a/chrome/app/breakpad_linux_stub.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 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.
-
-// This is a stub file which is compiled in when we are building without
-// breakpad support.
-
-void InitCrashReporter() {
-}
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 805565d..9f135b5 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -56,6 +56,8 @@
 #endif
 #if defined(OS_LINUX)
 #include "base/nss_init.h"
+#endif
+#if defined(USE_LINUX_BREAKPAD)
 #include "chrome/app/breakpad_linux.h"
 #endif
 #include "chrome/app/scoped_ole_initializer.h"