Add webui handler for promotions on Android NTP.

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 1e2a82484ceba19288be28bd5470e1970ccd2cb6..f750e51b449aad00c32a856a9c58c68ebed8604b 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -111,6 +111,10 @@
 #include "chrome/browser/chrome_to_mobile_service.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/ui/webui/ntp/android/promo_handler.h"
+#endif
+
 namespace {
 
 enum MigratedPreferences {
@@ -234,6 +238,10 @@ void RegisterUserPrefs(PrefService* user_prefs) {
   geolocation::RegisterUserPrefs(user_prefs);
 #endif
 
+#if defined(OS_ANDROID)

[battre, 2012/08/29 21:04:19]

any reason for not combining this with the previous #if?

[aruslan, 2012/08/29 21:52:53]

Yes, this is to avoid unnecessary conflicts during the merge -- the previous one
is going to be either removed or moved.
I can merge them if you'd prefer that.

[battre, 2012/08/29 21:58:24]

Up to you. If it gets moved/deleted soon anyway there is no need to merge it.

+  PromoHandler::RegisterUserPrefs(user_prefs);
+#endif
+
 #if defined(USE_ASH)
   ash::RegisterChromeLauncherUserPrefs(user_prefs);
 #endif