| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 53ab0edc37701149741d998b77d95acc98dee5e6..ddcc3709d34b3e8686321f80ee92cccc4c28c8b4 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -619,10 +619,6 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
|
| RendererContentSettingRules rules;
|
| GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules);
|
| host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
|
| -
|
| -#if defined(OS_ANDROID) && defined(USE_LINUX_BREAKPAD)
|
| - InitCrashDumpManager();
|
| -#endif
|
| }
|
|
|
| content::WebUIControllerFactory*
|
| @@ -1846,7 +1842,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
| 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.";
|
| @@ -1873,13 +1869,6 @@ const wchar_t* ChromeContentBrowserClient::GetResourceDllName() {
|
| }
|
| #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(
|
|
|