Remove NOTIFICATION_SYSTEM_SETTING_CHANGED, switch CrosSettings to base::CallbackRegistry.

chrome/browser/chromeos/policy/device_local_account_policy_service.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 "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_store.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/policy/cloud/cloud_policy_client.h"
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
 #include "chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h"
 #include "chrome/browser/policy/cloud/device_management_service.h"
 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/notification_details.h"

[Lei Zhang, 2013/09/18 05:00:53]

Remove

[Avi (use Gerrit), 2013/09/18 16:41:44]

Done.

 #include "policy/policy_constants.h"
 
 namespace em = enterprise_management;
 
 namespace policy {
 
 namespace {
 
 // Creates a broker for the device-local account with the given |user_id| and
 // |account_id|.
@@ skipping 118 matching lines @@
 
 DeviceLocalAccountPolicyService::DeviceLocalAccountPolicyService(
     chromeos::SessionManagerClient* session_manager_client,
     chromeos::DeviceSettingsService* device_settings_service,
     chromeos::CrosSettings* cros_settings)
     : session_manager_client_(session_manager_client),
       device_settings_service_(device_settings_service),
       cros_settings_(cros_settings),
       device_management_service_(NULL),
       cros_settings_callback_factory_(this) {
-  cros_settings_->AddSettingsObserver(
-      chromeos::kAccountsPrefDeviceLocalAccounts, this);
+  local_accounts_subscription_ = cros_settings_->AddSettingsObserver(
+      chromeos::kAccountsPrefDeviceLocalAccounts,
+      base::Bind(&DeviceLocalAccountPolicyService::
+                     UpdateAccountListIfNonePending,
+                 base::Unretained(this)));
   UpdateAccountList();
 }
 
 DeviceLocalAccountPolicyService::~DeviceLocalAccountPolicyService() {
-  cros_settings_->RemoveSettingsObserver(
-      chromeos::kAccountsPrefDeviceLocalAccounts, this);
   DeleteBrokers(&policy_brokers_);
 }
 
 void DeviceLocalAccountPolicyService::Connect(
     DeviceManagementService* device_management_service) {
   DCHECK(!device_management_service_);
   device_management_service_ = device_management_service;
 
   // Connect the brokers.
   for (PolicyBrokerMap::iterator it(policy_brokers_.begin());
@@ skipping 30 matching lines @@
 }
 
 void DeviceLocalAccountPolicyService::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void DeviceLocalAccountPolicyService::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void DeviceLocalAccountPolicyService::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  if (type != chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED ||
-      *content::Details<const std::string>(details).ptr() !=
-          chromeos::kAccountsPrefDeviceLocalAccounts) {
-    NOTREACHED();
-    return;
-  }
-
-  // Avoid unnecessary calls to UpdateAccountList(): If an earlier call is still
-  // pending (because the |cros_settings_| are not trusted yet), the updated
-  // account list will be processed by that call when it eventually runs.
-  if (!cros_settings_callback_factory_.HasWeakPtrs())
-    UpdateAccountList();
-}
-
 void DeviceLocalAccountPolicyService::OnStoreLoaded(CloudPolicyStore* store) {
   DeviceLocalAccountPolicyBroker* broker = GetBrokerForStore(store);
   DCHECK(broker);
   if (!broker)
     return;
   broker->UpdateRefreshDelay();
   FOR_EACH_OBSERVER(Observer, observers_, OnPolicyUpdated(broker->user_id()));
 }
 
 void DeviceLocalAccountPolicyService::OnStoreError(CloudPolicyStore* store) {
   DeviceLocalAccountPolicyBroker* broker = GetBrokerForStore(store);
   DCHECK(broker);
   if (!broker)
     return;
   FOR_EACH_OBSERVER(Observer, observers_, OnPolicyUpdated(broker->user_id()));
 }
 
+void DeviceLocalAccountPolicyService::UpdateAccountListIfNonePending() {
+  // Avoid unnecessary calls to UpdateAccountList(): If an earlier call is still
+  // pending (because the |cros_settings_| are not trusted yet), the updated
+  // account list will be processed by that call when it eventually runs.
+  if (!cros_settings_callback_factory_.HasWeakPtrs())
+    UpdateAccountList();
+}
+
 void DeviceLocalAccountPolicyService::UpdateAccountList() {
   if (chromeos::CrosSettingsProvider::TRUSTED !=
           cros_settings_->PrepareTrustedValues(
               base::Bind(&DeviceLocalAccountPolicyService::UpdateAccountList,
                          cros_settings_callback_factory_.GetWeakPtr()))) {
     return;
   }
 
   // Update |policy_brokers_|, keeping existing entries.
   PolicyBrokerMap new_policy_brokers;
@@ skipping 33 matching lines @@
         CloudPolicyStore* store) {
   for (PolicyBrokerMap::iterator it(policy_brokers_.begin());
        it != policy_brokers_.end(); ++it) {
     if (it->second.broker && it->second.broker->core()->store() == store)
       return it->second.broker;
   }
   return NULL;
 }
 
 }  // namespace policy