Unify Preferences Mojom Naming to PreferencesService

chrome/browser/prefs/preferences_connection_manager.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 "chrome/browser/prefs/preferences_connection_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/prefs/preferences_manager.h"
+#include "chrome/browser/prefs/preferences_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 
 namespace {
 
 // Required singleton subclass to control dependencies between
 // PreferenceConnectionManager and the KeyedServiceShutdownNotifier.
@@ skipping 17 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ShutdownNotifierFactory);
 };
 
 }  // namespace
 
 PreferencesConnectionManager::PreferencesConnectionManager() {}
 
 PreferencesConnectionManager::~PreferencesConnectionManager() {}
 
 void PreferencesConnectionManager::OnConnectionError(
-    mojo::StrongBindingPtr<prefs::mojom::PreferencesManager> binding) {
+    mojo::StrongBindingPtr<prefs::mojom::PreferencesService> binding) {
   if (!binding)
     return;
   for (auto it = manager_bindings_.begin(); it != manager_bindings_.end();
        ++it) {
     if (it->get() == binding.get()) {
       manager_bindings_.erase(it);
       return;
     }
   }
 }
 
 void PreferencesConnectionManager::OnProfileDestroyed() {
   for (auto& it : manager_bindings_) {
     // Shutdown any PreferenceManager that is still alive.
     if (it)
       it->Close();
   }
 
   profile_shutdown_notification_.reset();
 }
 
 void PreferencesConnectionManager::Create(
-    prefs::mojom::PreferencesObserverPtr observer,
-    prefs::mojom::PreferencesManagerRequest manager) {
+    prefs::mojom::PreferencesServiceClientPtr client,
+    prefs::mojom::PreferencesServiceRequest service) {
   // Certain tests have no profiles to connect to, and static initializers
   // which block the creation of test profiles.
   if (!g_browser_process->profile_manager()->GetNumberOfProfiles())
     return;
 
   Profile* profile = ProfileManager::GetActiveUserProfile();
-  mojo::StrongBindingPtr<prefs::mojom::PreferencesManager> binding =
+  mojo::StrongBindingPtr<prefs::mojom::PreferencesService> binding =
       mojo::MakeStrongBinding(
-          base::MakeUnique<PreferencesManager>(std::move(observer), profile),
-          std::move(manager));
+          base::MakeUnique<PreferencesService>(std::move(client), profile),
+          std::move(service));
   // Copying the base::WeakPtr for future deletion.
   binding->set_connection_error_handler(
       base::Bind(&PreferencesConnectionManager::OnConnectionError,
                  base::Unretained(this), binding));
   manager_bindings_.push_back(std::move(binding));
 }
 
 void PreferencesConnectionManager::Create(
     const service_manager::Identity& remote_identity,
-    prefs::mojom::PreferencesFactoryRequest request) {
+    prefs::mojom::PreferencesServiceFactoryRequest request) {
   factory_bindings_.AddBinding(this, std::move(request));
 }
 
 void PreferencesConnectionManager::OnStart() {
   // Certain tests have no profiles to connect to, and static initializers
   // which block the creation of test profiles.
   if (!g_browser_process->profile_manager()->GetNumberOfProfiles())
     return;
 
   profile_shutdown_notification_ =
       ShutdownNotifierFactory::GetInstance()
           ->Get(ProfileManager::GetActiveUserProfile())
           ->Subscribe(
               base::Bind(&PreferencesConnectionManager::OnProfileDestroyed,
                          base::Unretained(this)));
 }
 
 bool PreferencesConnectionManager::OnConnect(
     const service_manager::ServiceInfo& remote_info,
     service_manager::InterfaceRegistry* registry) {
-  registry->AddInterface<prefs::mojom::PreferencesFactory>(this);
+  registry->AddInterface<prefs::mojom::PreferencesServiceFactory>(this);
   return true;
 }