Blimp Settings framework on the c++ side

blimp/client/core/blimp_client_context_impl.cc

Index: blimp/client/core/blimp_client_context_impl.cc
diff --git a/blimp/client/core/blimp_client_context_impl.cc b/blimp/client/core/blimp_client_context_impl.cc
index 246d78d4b8f24cfd71c33fbaa06f981d7b87b400..4446728d03542f8d207ff4d0e244b44bbad7ade1 100644
--- a/blimp/client/core/blimp_client_context_impl.cc
+++ b/blimp/client/core/blimp_client_context_impl.cc
@@ -23,9 +23,12 @@
 #include "blimp/client/core/geolocation/geolocation_feature.h"
 #include "blimp/client/core/render_widget/render_widget_feature.h"
 #include "blimp/client/core/session/cross_thread_network_event_observer.h"
+#include "blimp/client/core/settings/record_whole_document_observer.h"
+#include "blimp/client/core/settings/settings.h"
 #include "blimp/client/core/settings/settings_feature.h"
 #include "blimp/client/public/blimp_client_context_delegate.h"
 #include "blimp/client/public/compositor/compositor_dependencies.h"
+#include "components/prefs/pref_service.h"
 #include "device/geolocation/geolocation_delegate.h"
 #include "device/geolocation/location_arbitrator.h"
 #include "ui/gfx/native_widget_types.h"
@@ -50,22 +53,35 @@ const char kDefaultAssignerUrl[] =
 BlimpClientContext* BlimpClientContext::Create(
     scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
-    std::unique_ptr<CompositorDependencies> compositor_dependencies) {
+    std::unique_ptr<CompositorDependencies> compositor_dependencies,
+    PrefService* local_state) {
 #if defined(OS_ANDROID)
   return new BlimpClientContextImplAndroid(io_thread_task_runner,
                                            file_thread_task_runner,
-                                           std::move(compositor_dependencies));
+                                           std::move(compositor_dependencies),
+                                           local_state);
 #else
   return new BlimpClientContextImpl(io_thread_task_runner,
                                     file_thread_task_runner,
-                                    std::move(compositor_dependencies));
+                                    std::move(compositor_dependencies),
+                                    local_state);
 #endif  // defined(OS_ANDROID)
 }
 
+// This function is declared in //blimp/client/public/blimp_client_context.h
+// and either this function or the one in
+// //blimp/client/core/dummy_blimp_client_context.cc should be linked in to
+// any binary using BlimpClientContext::RegisterPrefs.
+// static
+void BlimpClientContext::RegisterPrefs(PrefRegistrySimple* registry) {
+  Settings::RegisterPrefs(registry);
+}
+
 BlimpClientContextImpl::BlimpClientContextImpl(
     scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
-    std::unique_ptr<CompositorDependencies> compositor_dependencies)
+    std::unique_ptr<CompositorDependencies> compositor_dependencies,
+    PrefService* local_state)
     : BlimpClientContext(),
       io_thread_task_runner_(io_thread_task_runner),
       file_thread_task_runner_(file_thread_task_runner),
@@ -87,6 +103,7 @@ BlimpClientContextImpl::BlimpClientContextImpl(
                                    navigation_feature_.get(),
                                    render_widget_feature_.get(),
                                    tab_control_feature_.get())),
+      settings_(new Settings(local_state)),
       weak_factory_(this) {
   net_components_.reset(new ClientNetworkComponents(
       base::MakeUnique<CrossThreadNetworkEventObserver>(
@@ -221,9 +238,10 @@ void BlimpClientContextImpl::RegisterFeatures() {
 }
 
 void BlimpClientContextImpl::InitializeSettings() {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDownloadWholeDocument))
-    settings_feature_->SetRecordWholeDocument(true);
+  std::unique_ptr<RecordWholeDocumentObserver> record_document_observer =
+      base::MakeUnique<RecordWholeDocumentObserver>(settings_feature_.get());
+  settings_->AddObserver(std::move(record_document_observer));
+  settings_->InitializeFromCommandLineAndPref();
 }
 
 void BlimpClientContextImpl::CreateIdentitySource() {