Factor Google Now welcome notifications out of DesktopNotificationService.

chrome/browser/prefs/browser_prefs.cc

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..058b33e32471efc5390da5a10a983c28db761e5f 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -43,6 +43,7 @@
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
+#include "chrome/browser/notifications/extensions/extension_welcome_notification.h"
 #include "chrome/browser/notifications/message_center_notification_manager.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #include "chrome/browser/plugins/plugin_finder.h"
@@ -425,6 +426,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   DesktopNotificationService::RegisterProfilePrefs(registry);
 #endif
 
+#if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS)
+  ExtensionWelcomeNotification::RegisterProfilePrefs(registry);

[robliao, 2014/09/18 20:13:06]

And a quick question here. What happens if there is a
MessageCenterNotificationManager Registration but no
ExtensionWelcomeNotification registration?

[Peter Beverloo, 2014/09/19 13:01:22]

Hm, this would occur for an Android build which enables both notifications and
extensions. I've updated the #ifdef to check for !ANDROID as well.

What would happen -- I'm not sure, I'm not familiar enough with the preference
system to comment on that. Quickly checking with bauerb@ revealed that we'd hit
a DCHECK.

+#endif
+
 #if defined(ENABLE_SERVICE_DISCOVERY)
   LocalDiscoveryUI::RegisterProfilePrefs(registry);
 #endif