mash: switch to the new pref service

ash/shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 106 matching lines @@
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/sys_info.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/trace_event/trace_event.h"
 #include "chromeos/audio/audio_a11y_controller.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/system/devicemode.h"
+#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h"
 #include "components/ui_devtools/devtools_server.h"
-#include "services/preferences/public/cpp/pref_client_store.h"
+#include "services/preferences/public/cpp/pref_service_factory.h"
 #include "services/preferences/public/interfaces/preferences.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "ui/app_list/presenter/app_list.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/mus/user_activity_forwarder.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ skipping 582 matching lines @@
   // ShelfWindowWatcher has window observers and a pointer to the shelf model.
   shelf_window_watcher_.reset();
 
   // ShelfItemDelegate subclasses it owns have complex cleanup to run (e.g. ARC
   // shelf items in Chrome) so explicitly shutdown early.
   shelf_model()->DestroyItemDelegates();
 
   // Must be destroyed before FocusController.
   shelf_delegate_.reset();
 
-  // Removes itself as an observer of |pref_store_|.
+  // Removes itself as an observer of |pref_service_|.
   shelf_controller_.reset();
 
   wm_shell_->Shutdown();
 
   // Depends on |focus_controller_|, so must be destroyed before.
   window_tree_host_manager_.reset();
   focus_controller_->RemoveObserver(this);
   focus_controller_.reset();
   screen_position_controller_.reset();
 
@@ skipping 11 matching lines @@
 
   PowerStatus::Shutdown();
 
   // Ensure that DBusThreadManager outlives this Shell.
   DCHECK(chromeos::DBusThreadManager::IsInitialized());
 
   // Needs to happen right before |instance_| is reset.
   wm_shell_.reset();
   session_controller_->RemoveSessionStateObserver(this);
   wallpaper_delegate_.reset();
-  pref_store_ = nullptr;
+  pref_service_ = nullptr;
   shell_delegate_.reset();
 
   DCHECK(instance_ == this);
   instance_ = nullptr;
 }
 
 void Shell::Init(const ShellInitParams& init_params) {
   const bool is_mash = wm_shell_->IsRunningInMash();
 
   blocking_pool_ = init_params.blocking_pool;
 
   wallpaper_delegate_ = shell_delegate_->CreateWallpaperDelegate();
 
   // Can be null in tests.
-  if (shell_delegate_->GetShellConnector()) {
-    prefs::mojom::PreferencesServiceFactoryPtr pref_factory_ptr;
-    shell_delegate_->GetShellConnector()->BindInterface(
-        prefs::mojom::kServiceName, &pref_factory_ptr);
-    pref_store_ = new preferences::PrefClientStore(std::move(pref_factory_ptr));
+  if (wm_shell_->IsRunningInMash() && shell_delegate_->GetShellConnector()) {
+    prefs::ConnectToPrefService(
+        shell_delegate_->GetShellConnector(),
+        make_scoped_refptr(new PrefRegistrySimple()),
+        base::Bind(&Shell::OnPrefServiceInitialized, base::Unretained(this)),
+        prefs::mojom::kForwarderServiceName);
   }
 
   // Some delegates access WmShell during their construction. Create them here
   // instead of the WmShell constructor.
   accessibility_delegate_.reset(shell_delegate_->CreateAccessibilityDelegate());
   palette_delegate_ = shell_delegate_->CreatePaletteDelegate();
   toast_manager_ = base::MakeUnique<ToastManager>();
 
   // Install the custom factory early on so that views::FocusManagers for Tray,
   // Shelf, and WallPaper could be created by the factory.
@@ skipping 426 matching lines @@
   }
 
   // Only trigger an update in mash because with classic ash chrome calls
   // UpdateAfterLoginStatusChange() directly.
   if (wm_shell_->IsRunningInMash()) {
     // TODO(jamescook): Should this call Shell::OnLoginStatusChanged() too?
     UpdateAfterLoginStatusChange(session_controller_->GetLoginStatus());
   }
 }
 
+void Shell::OnPrefServiceInitialized(
+    std::unique_ptr<::PrefService> pref_service) {
+  if (!instance_)
+    return;
+  DCHECK(pref_service);
+  pref_service_ = std::move(pref_service);
+}
+
 }  // namespace ash