Switch Preferences to use Factory

ash/common/wm_shell.cc

 // Copyright 2016 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/common/wm_shell.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/ash_focus_manager_factory.h"
@@ skipping 275 matching lines @@
       shutdown_controller_(base::MakeUnique<ShutdownController>()),
       system_tray_controller_(base::MakeUnique<SystemTrayController>()),
       system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
       vpn_list_(base::MakeUnique<VpnList>()),
       wallpaper_delegate_(delegate_->CreateWallpaperDelegate()),
       window_cycle_controller_(base::MakeUnique<WindowCycleController>()),
       window_selector_controller_(
           base::MakeUnique<WindowSelectorController>()) {
   session_controller_->AddSessionStateObserver(this);
 
-  prefs::mojom::PreferencesManagerPtr pref_manager_ptr;
+  prefs::mojom::PreferencesFactoryPtr pref_factory_ptr;
   // Can be null in tests.
   if (!delegate_->GetShellConnector())
     return;
   delegate_->GetShellConnector()->BindInterface(prefs::mojom::kServiceName,
-                                                &pref_manager_ptr);
-  pref_store_ = new preferences::PrefObserverStore(std::move(pref_manager_ptr));
+                                                &pref_factory_ptr);
+  pref_store_ = new preferences::PrefObserverStore(std::move(pref_factory_ptr));
 }
 
 RootWindowController* WmShell::GetPrimaryRootWindowController() {
   return GetPrimaryRootWindow()->GetRootWindowController();
 }
 
 WmWindow* WmShell::GetRootWindowForNewWindows() {
   if (scoped_root_window_for_new_windows_)
     return scoped_root_window_for_new_windows_;
   return root_window_for_new_windows_;
@@ skipping 142 matching lines @@
 
 void WmShell::OnAttemptToReactivateWindow(aura::Window* request_active,
                                           aura::Window* actual_active) {
   for (auto& observer : activation_observers_) {
     observer.OnAttemptToReactivateWindow(WmWindow::Get(request_active),
                                          WmWindow::Get(actual_active));
   }
 }
 
 }  // namespace ash