Blimp Settings framework on the c++ side

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 ee6f76fbfe6dcf6e63bad7de50c86bd019a995af..c357aea1758108760d5addef66c368516cd7e966 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -157,6 +157,7 @@
 #endif
 
 #if defined(OS_ANDROID)
+#include "blimp/client/public/blimp_client_context.h"
 #include "chrome/browser/notifications/notification_platform_bridge_android.h"
 #include "components/ntp_snippets/offline_pages/offline_page_suggestions_provider.h"
 #else
@@ -577,6 +578,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 #if defined(OS_ANDROID)
   NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry);
   ntp_snippets::OfflinePageSuggestionsProvider::RegisterProfilePrefs(registry);
+  blimp::client::BlimpClientContext::RegisterPrefs(registry);
 #else
   browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
   gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);