| Index: android_webview/browser/aw_content_browser_client.cc
 | 
| diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
 | 
| index 573e2416297bdfbee1162d2bfb320b94748c796f..07d7b0b79dd86ae413c1404fe1917fe65ac34d7c 100644
 | 
| --- a/android_webview/browser/aw_content_browser_client.cc
 | 
| +++ b/android_webview/browser/aw_content_browser_client.cc
 | 
| @@ -24,8 +24,10 @@
 | 
|  #include "base/android/locale_utils.h"
 | 
|  #include "base/base_paths_android.h"
 | 
|  #include "base/command_line.h"
 | 
| +#include "base/files/scoped_file.h"
 | 
|  #include "base/path_service.h"
 | 
|  #include "components/cdm/browser/cdm_message_filter_android.h"
 | 
| +#include "components/crash/content/browser/crash_micro_dump_manager_android.h"
 | 
|  #include "components/navigation_interception/intercept_navigation_delegate.h"
 | 
|  #include "content/public/browser/access_token_store.h"
 | 
|  #include "content/public/browser/browser_message_filter.h"
 | 
| @@ -431,9 +433,15 @@ content::AccessTokenStore* AwContentBrowserClient::CreateAccessTokenStore() {
 | 
|  }
 | 
|  
 | 
|  bool AwContentBrowserClient::IsFastShutdownPossible() {
 | 
| -  NOTREACHED() << "Android WebView is single process, so IsFastShutdownPossible"
 | 
| -               << " should never be called";
 | 
| -  return false;
 | 
| +  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
 | 
| +          switches::kSingleProcess)) {
 | 
| +    NOTREACHED()
 | 
| +        << "Android WebView is single process, so IsFastShutdownPossible"
 | 
| +        << " should never be called";
 | 
| +    return false;
 | 
| +  } else {
 | 
| +    return true;
 | 
| +  }
 | 
|  }
 | 
|  
 | 
|  void AwContentBrowserClient::ClearCache(content::RenderFrameHost* rfh) {
 | 
| @@ -485,6 +493,14 @@ void AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
 | 
|  
 | 
|    fd = ui::GetLocalePackFd(&(*regions)[kAndroidWebViewLocalePakDescriptor]);
 | 
|    mappings->Share(kAndroidWebViewLocalePakDescriptor, fd);
 | 
| +
 | 
| +  base::File crash_signal_file =
 | 
| +      breakpad::CrashMicroDumpManager::GetInstance()->CreateCrashInfoChannel(
 | 
| +          child_process_id);
 | 
| +  if (crash_signal_file.IsValid()) {
 | 
| +    mappings->Transfer(kAndroidWebViewCrashSignalDescriptor,
 | 
| +                       base::ScopedFD(crash_signal_file.TakePlatformFile()));
 | 
| +  }
 | 
|  }
 | 
|  
 | 
|  void AwContentBrowserClient::OverrideWebkitPrefs(
 | 
| 
 |