Remove old cloud policy code.

chrome/browser/chromeos/login/version_info_updater.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/login/version_info_updater.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 57 matching lines @@
         &tracker_);
     boot_times_loader_.GetBootTimes(
         base::Bind(is_official_build ? &VersionInfoUpdater::OnBootTimesNoop
                                      : &VersionInfoUpdater::OnBootTimes,
                    weak_pointer_factory_.GetWeakPtr()),
         &tracker_);
   } else {
     UpdateVersionLabel();
   }
 
-  policy::CloudPolicySubsystem* cloud_policy =
-      g_browser_process->browser_policy_connector()->
-          device_cloud_policy_subsystem();
-  if (cloud_policy) {
-    // Two-step reset because we want to construct new ObserverRegistrar after
-    // destruction of old ObserverRegistrar to avoid DCHECK violation because
-    // of adding existing observer.
-    cloud_policy_registrar_.reset();
-    cloud_policy_registrar_.reset(
-        new policy::CloudPolicySubsystem::ObserverRegistrar(
-            cloud_policy, this));
-
-    // Ensure that we have up-to-date enterprise info in case enterprise policy
-    // is already fetched and has finished initialization.
-    UpdateEnterpriseInfo();
-  }
-
   policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
       g_browser_process->browser_policy_connector()->
           GetDeviceCloudPolicyManager();
   if (policy_manager) {
     policy_manager->core()->store()->AddObserver(this);
 
     // Ensure that we have up-to-date enterprise info in case enterprise policy
     // is already fetched and has finished initialization.
     UpdateEnterpriseInfo();
   }
@@ skipping 21 matching lines @@
   if (delegate_)
     delegate_->OnOSVersionLabelTextUpdated(label_text);
 }
 
 void VersionInfoUpdater::UpdateEnterpriseInfo() {
   SetEnterpriseInfo(
       g_browser_process->browser_policy_connector()->GetEnterpriseDomain());
 }
 
 void VersionInfoUpdater::SetEnterpriseInfo(const std::string& domain_name) {
-  if (domain_name != enterprise_domain_text_) {
-    enterprise_domain_text_ = domain_name;
-    UpdateVersionLabel();
-
-    // Update the notification about device status reporting.
-    if (delegate_) {
-      std::string enterprise_info;
-      if (!domain_name.empty()) {
-        enterprise_info = l10n_util::GetStringFUTF8(
-            IDS_DEVICE_OWNED_BY_NOTICE,
-            UTF8ToUTF16(domain_name));
-        delegate_->OnEnterpriseInfoUpdated(enterprise_info);
-      }
+  // Update the notification about device status reporting.
+  if (delegate_) {

[Joao da Silva, 2013/01/22 12:39:03]

if (delegate_ && !domain_name.empty()) {  ... }

[Mattias Nissler (ping if slow), 2013/01/22 14:14:52]

Done.

+    std::string enterprise_info;
+    if (!domain_name.empty()) {
+      enterprise_info = l10n_util::GetStringFUTF8(
+          IDS_DEVICE_OWNED_BY_NOTICE,
+          UTF8ToUTF16(domain_name));
+      delegate_->OnEnterpriseInfoUpdated(enterprise_info);
     }
   }
 }
 
 void VersionInfoUpdater::OnVersion(const std::string& version) {
   version_text_ = version;
   UpdateVersionLabel();
 }
 
 void VersionInfoUpdater::OnBootTimesNoop(
@@ skipping 22 matching lines @@
             kBootTimesNoChromeExec,
             boot_times.total,
             boot_times.pre_startup,
             boot_times.system);
   }
   // Use UTF8ToWide once this string is localized.
   if (delegate_)
     delegate_->OnBootTimesLabelTextUpdated(boot_times_text);
 }
 
-void VersionInfoUpdater::OnPolicyStateChanged(
-    policy::CloudPolicySubsystem::PolicySubsystemState state,
-    policy::CloudPolicySubsystem::ErrorDetails error_details) {
-  UpdateEnterpriseInfo();
-}
-
 void VersionInfoUpdater::OnStoreLoaded(policy::CloudPolicyStore* store) {
   UpdateEnterpriseInfo();
 }
 
 void VersionInfoUpdater::OnStoreError(policy::CloudPolicyStore* store) {
   UpdateEnterpriseInfo();
 }
 
 void VersionInfoUpdater::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED)
     UpdateEnterpriseInfo();
   else
     NOTREACHED();
 }
 
 }  // namespace chromeos