Blimp Settings framework on the c++ side

chrome/browser/prefs/chrome_command_line_pref_store.cc

Index: chrome/browser/prefs/chrome_command_line_pref_store.cc
diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc
index 349e18630b1bf02f7ec592995beaa4ec96745db5..0e3b1108ffad5267d3189fd72ebc57831f76d28b 100644
--- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
+++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
@@ -18,6 +18,7 @@
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "build/build_config.h"
+#include "chrome/browser/android/preferences/command_line_pref_store_android.h"

[Lei Zhang, 2016/10/26 01:52:05]

Put this behind #if defined(OS_ANDROID) down around like 34.

[Menglin, 2016/10/26 19:28:33]

Done.

 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
@@ -114,6 +115,9 @@ void ChromeCommandLinePrefStore::ApplySimpleSwitches() {
   ApplyPathSwitches(path_switch_map_, arraysize(path_switch_map_));
   ApplyIntegerSwitches(integer_switch_map_, arraysize(integer_switch_map_));
   ApplyBooleanSwitches(boolean_switch_map_, arraysize(boolean_switch_map_));
+#if defined(OS_ANDROID)
+  ::android::ApplyBlimpSwitches(this);
+#endif
 }
 
 void ChromeCommandLinePrefStore::ApplyProxyMode() {