Index: chrome/browser/prefs/browser_prefs.cc |
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc |
index 3d27e95d20b471c124d4cd38ad43e5683bf3e516..4992da832b831b0e82d74ab6c24f1d2463ad3210 100644 |
--- a/chrome/browser/prefs/browser_prefs.cc |
+++ b/chrome/browser/prefs/browser_prefs.cc |
@@ -82,6 +82,7 @@ |
#include "components/autofill/core/browser/autofill_manager.h" |
#include "components/bookmarks/browser/bookmark_utils.h" |
#include "components/dom_distiller/core/distilled_page_prefs.h" |
+#include "components/gcm_driver/gcm_channel_status_syncer.h" |
#include "components/google/core/browser/google_pref_names.h" |
#include "components/google/core/browser/google_url_tracker.h" |
#include "components/network_time/network_time_tracker.h" |
@@ -293,6 +294,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { |
AutomaticProfileResetterFactory::RegisterPrefs(registry); |
BackgroundModeManager::RegisterPrefs(registry); |
RegisterBrowserPrefs(registry); |
+ // The native GCM is used on Android instead. |
+ gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); |
#if !defined(OS_CHROMEOS) |
RegisterDefaultBrowserPromptPrefs(registry); |
#endif // !defined(OS_CHROMEOS) |
@@ -443,6 +446,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
first_run::RegisterProfilePrefs(registry); |
+ gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |
NewTabUI::RegisterProfilePrefs(registry); |
PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
PinnedTabCodec::RegisterProfilePrefs(registry); |