[Sync] Replace manual DI with SetTestingFactory.

chrome/browser/ui/webui/sync_internals_message_handler.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_MESSAGE_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_MESSAGE_HANDLER_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 78 matching lines @@
   // Helper to emit counter updates.
   //
   // Used in implementation of On*CounterUpdated methods.  Emits the given
   // dictionary value with additional data to specify the model type and
   // counter type.
   void EmitCounterUpdate(syncer::ModelType type,
                          const std::string& counter_type,
                          std::unique_ptr<base::DictionaryValue> value);
 
  protected:
-  using SyncServiceProvider = base::RepeatingCallback<syncer::SyncService*()>;
-
   using AboutSyncDataDelegate =
       base::RepeatingCallback<std::unique_ptr<base::DictionaryValue>(
           syncer::SyncService* service,
           version_info::Channel channel)>;
 
   // Constructor used for unit testing to override dependencies.
-  SyncInternalsMessageHandler(SyncServiceProvider sync_service_provider,
-                              AboutSyncDataDelegate about_sync_data_delegate);
+  explicit SyncInternalsMessageHandler(
+      AboutSyncDataDelegate about_sync_data_delegate);
 
  private:
   // Fetches updated aboutInfo and sends it to the page in the form of an
   // onAboutInfoUpdated event.
   void SendAboutInfo();
 
   // Gets the ProfileSyncService of the underlying original profile. May return
-  // nullptr (e.g., if sync is disabled on the command line). Shouldn't be
-  // called directly, but instead through |sync_service_provider_|.
-  syncer::SyncService* BindForSyncServiceProvider();
+  // nullptr (e.g., if sync is disabled on the command line).
+  syncer::SyncService* GetSyncService();
 
   // Sends a dispatch event to the UI. Javascript must be enabled.
   void DispatchEvent(const std::string& name, const base::Value& details_value);
 
   // Unregisters for notifications from all notifications coming from the sync
   // machinery. Leaves notifications hooked into the UI alone.
   void UnregisterModelNotifications();
 
   base::WeakPtr<syncer::JsController> js_controller_;
 
   // A flag used to prevent double-registration with ProfileSyncService.
   bool is_registered_ = false;
 
   // A flag used to prevent double-registration as TypeDebugInfoObserver with
   // ProfileSyncService.
   bool is_registered_for_counters_ = false;
 
-  // An abstraction of who provides the SyncService.
-  SyncServiceProvider sync_service_provider_;
-
   // An abstraction of who creates the about sync info value map.
   AboutSyncDataDelegate about_sync_data_delegate_;
 
   base::WeakPtrFactory<SyncInternalsMessageHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncInternalsMessageHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_MESSAGE_HANDLER_H_