Fix for a crasher when starting a renderer.

chrome/browser/chrome_content_browser_client.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/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 601 matching lines @@
       new prerender::PrerenderMessageFilter(id, profile));
 
   host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
       profile->IsOffTheRecord()));
 
   SendExtensionWebRequestStatusToHost(host);
 
   RendererContentSettingRules rules;
   GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules);
   host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
-
-#if defined(OS_ANDROID) && defined(USE_LINUX_BREAKPAD)
-  InitCrashDumpManager();
-#endif
 }
 
 content::WebUIControllerFactory*
     ChromeContentBrowserClient::GetWebUIControllerFactory() {
   return ChromeWebUIControllerFactory::GetInstance();
 }
 
 GURL ChromeContentBrowserClient::GetEffectiveURL(
     content::BrowserContext* browser_context, const GURL& url) {
   Profile* profile = Profile::FromBrowserContext(browser_context);
@@ skipping 1203 matching lines @@
 
   const std::string locale = GetApplicationLocale();
   FilePath locale_pak = ResourceBundle::GetSharedInstance().
       GetLocaleFilePath(locale, false);
   f = base::CreatePlatformFile(locale_pak, flags, NULL, NULL);
   DCHECK(f != base::kInvalidPlatformFileValue);
   mappings->push_back(FileDescriptorInfo(kAndroidLocalePakDescriptor,
                                          FileDescriptor(f, true)));
 
 #if defined(USE_LINUX_BREAKPAD)
-  f = crash_dump_manager_->CreateMinidumpFile(child_process_id);
+  f = CrashDumpManager::GetInstance()->CreateMinidumpFile(child_process_id);
   if (f == base::kInvalidPlatformFileValue) {
     LOG(ERROR) << "Failed to create file for minidump, crash reporting will be "
         "disabled for this process.";
   } else {
     mappings->push_back(FileDescriptorInfo(kAndroidMinidumpDescriptor,
                                            FileDescriptor(f, true)));
   }
 #endif  // defined(USE_LINUX_BREAKPAD)
 
 #else
   int crash_signal_fd = GetCrashSignalFD(command_line);
   if (crash_signal_fd >= 0) {
     mappings->push_back(FileDescriptorInfo(kCrashDumpSignal,
                                            FileDescriptor(crash_signal_fd,
                                                           false)));
   }
 #endif  // defined(OS_ANDROID)
 }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
 #if defined(OS_WIN)
 const wchar_t* ChromeContentBrowserClient::GetResourceDllName() {
   return chrome::kBrowserResourcesDll;
 }
 #endif
 
-#if defined(OS_ANDROID)
-void ChromeContentBrowserClient::InitCrashDumpManager() {
-  if (!crash_dump_manager_.get())
-    crash_dump_manager_.reset(new CrashDumpManager());
-}
-#endif
-
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return chrome::NewCryptoModuleBlockingDialogDelegate(
       chrome::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 void ChromeContentBrowserClient::SetApplicationLocale(
@@ skipping 15 matching lines @@
     io_thread_application_locale_ = locale;
 }
 
 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
     const std::string& locale) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   io_thread_application_locale_ = locale;
 }
 
 }  // namespace chrome