Make the pref_service in TestShellDelegate injectable.

ash/test/test_shell_delegate.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/test/test_shell_delegate.h"
 
 #include <limits>
 
 #include "ash/default_accessibility_delegate.h"
 #include "ash/gpu_support_stub.h"
 #include "ash/palette_delegate.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_observer.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/test/test_keyboard_ui.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/test/test_wallpaper_delegate.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_window.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "components/prefs/pref_service.h"
-#include "components/prefs/testing_pref_service.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/image/image.h"
 
 namespace ash {
 namespace test {
 
 // A ShellObserver that sets the shelf alignment and auto hide behavior when the
 // shelf is created, to simulate ChromeLauncherController's behavior.
 class ShelfInitializer : public ShellObserver {
  public:
@@ skipping 14 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShelfInitializer);
 };
 
 TestShellDelegate::TestShellDelegate()
     : num_exit_requests_(0),
       multi_profiles_enabled_(false),
       force_maximize_on_first_run_(false),
       touchscreen_enabled_in_local_pref_(true),
-      pref_service_(base::MakeUnique<TestingPrefServiceSimple>()) {}
+      active_user_pref_service_(nullptr) {}
 
 TestShellDelegate::~TestShellDelegate() {}
 
 ::service_manager::Connector* TestShellDelegate::GetShellConnector() const {
   return nullptr;
 }
 
 bool TestShellDelegate::IsIncognitoAllowed() const {
   return true;
 }
@@ skipping 69 matching lines @@
 
 base::string16 TestShellDelegate::GetProductName() const {
   return base::string16();
 }
 
 gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const {
   return gfx::Image();
 }
 
 PrefService* TestShellDelegate::GetActiveUserPrefService() const {
-  return pref_service_.get();
+  return active_user_pref_service_;
 }
 
 bool TestShellDelegate::IsTouchscreenEnabledInPrefs(
     bool use_local_state) const {
   return use_local_state ? touchscreen_enabled_in_local_pref_ : true;
 }
 
 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled,
                                                      bool use_local_state) {
   if (use_local_state)
     touchscreen_enabled_in_local_pref_ = enabled;
 }
 
 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {}
 
 }  // namespace test
 }  // namespace ash