diff options
| author | peter <peter@chromium.org> | 2014-12-01 12:12:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-01 20:12:32 +0000 |
| commit | 8c96df84fdd6d56c7b896d90ee08297659bf27d1 (patch) | |
| tree | 0056626e19eb9973614cb64dbe33af82d691018e /chrome/browser/browser_process_impl.cc | |
| parent | dcd07b389114e8eeb71d312ab01dff4d252b34f0 (diff) | |
| download | chromium_src-8c96df84fdd6d56c7b896d90ee08297659bf27d1.zip chromium_src-8c96df84fdd6d56c7b896d90ee08297659bf27d1.tar.gz chromium_src-8c96df84fdd6d56c7b896d90ee08297659bf27d1.tar.bz2 | |
Don't create a GCMDriver for Android in BrowserProcessImpl::CreateGCMDriver().
BUG=437827
Review URL: https://codereview.chromium.org/769893002
Cr-Commit-Position: refs/heads/master@{#306237}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 150d9d0..34ddec2 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -102,9 +102,7 @@ #include "chrome/browser/chrome_browser_main_mac.h" #endif -#if defined(OS_ANDROID) -#include "components/gcm_driver/gcm_driver_android.h" -#else +#if !defined(OS_ANDROID) #include "chrome/browser/chrome_device_client.h" #include "chrome/browser/services/gcm/gcm_desktop_utils.h" #include "components/gcm_driver/gcm_client_factory.h" @@ -1128,7 +1126,11 @@ void BrowserProcessImpl::CreateGCMDriver() { DCHECK(!gcm_driver_); #if defined(OS_ANDROID) - gcm_driver_.reset(new gcm::GCMDriverAndroid); + // Android's GCMDriver currently makes the assumption that it's a singleton. + // Until this gets fixed, instantiating multiple Java GCMDrivers will throw + // an exception, but because they're only initialized on demand these crashes + // would be very difficult to triage. See http://crbug.com/437827. + NOTREACHED(); #else base::FilePath store_path; CHECK(PathService::Get(chrome::DIR_GLOBAL_GCM_STORE, &store_path)); |