Remove old cloud policy code.

chrome/browser/policy/browser_policy_connector.cc

Index: chrome/browser/policy/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 1b47479c54d967637e06a2d207a07298bfee1aa9..82d811272ee866647814c17abdb1b30f609b7112 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -15,20 +15,14 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/async_policy_provider.h"
 #include "chrome/browser/policy/cloud_policy_client.h"
-#include "chrome/browser/policy/cloud_policy_provider.h"
 #include "chrome/browser/policy/cloud_policy_service.h"
-#include "chrome/browser/policy/cloud_policy_subsystem.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/device_management_service.h"
 #include "chrome/browser/policy/managed_mode_policy_provider.h"
 #include "chrome/browser/policy/policy_service_impl.h"
 #include "chrome/browser/policy/policy_statistics_collector.h"
-#include "chrome/browser/policy/user_policy_cache.h"
-#include "chrome/browser/policy/user_policy_token_cache.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/token_service.h"
-#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"

[Joao da Silva, 2013/01/17 09:38:05]

Not used

[Mattias Nissler (ping if slow), 2013/01/22 10:31:39]

Done.

@@ -59,12 +53,11 @@
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/policy/app_pack_updater.h"
-#include "chrome/browser/policy/cros_user_policy_cache.h"
 #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/policy/device_cloud_policy_store_chromeos.h"
 #include "chrome/browser/policy/device_local_account_policy_provider.h"
 #include "chrome/browser/policy/device_local_account_policy_service.h"
-#include "chrome/browser/policy/device_policy_cache.h"
+#include "chrome/browser/policy/device_status_collector.h"
 #include "chrome/browser/policy/network_configuration_updater.h"
 #include "chrome/browser/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/policy/user_cloud_policy_store_chromeos.h"
@@ -74,8 +67,6 @@
 #include "chrome/browser/policy/user_cloud_policy_manager_factory.h"
 #endif
 
-using content::BrowserThread;
-
 namespace policy {
 
 namespace {
@@ -129,27 +120,22 @@ void BrowserPolicyConnector::Init() {
       chromeos::CrosLibrary::Get()->GetCryptohomeLibrary();
   install_attributes_.reset(new EnterpriseInstallAttributes(cryptohome));
 
+  scoped_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store(
+      new DeviceCloudPolicyStoreChromeOS(
+          chromeos::DeviceSettingsService::Get(),
+          install_attributes_.get()));
+  device_cloud_policy_manager_.reset(
+      new DeviceCloudPolicyManagerChromeOS(
+          device_cloud_policy_store.Pass(),
+          install_attributes_.get()));
+
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (!command_line->HasSwitch(switches::kDisableCloudPolicyService)) {
-    scoped_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store(
-        new DeviceCloudPolicyStoreChromeOS(
-            chromeos::DeviceSettingsService::Get(),
-            install_attributes_.get()));
-    device_cloud_policy_manager_.reset(
-        new DeviceCloudPolicyManagerChromeOS(
-            device_cloud_policy_store.Pass(),
-            install_attributes_.get()));
-    if (!command_line->HasSwitch(switches::kDisableLocalAccounts)) {
-      device_local_account_policy_service_.reset(
-          new DeviceLocalAccountPolicyService(
-              chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
-              chromeos::DeviceSettingsService::Get()));
-    }
-  } else {
-    cloud_provider_.reset(new CloudPolicyProvider(this));
+  if (!command_line->HasSwitch(switches::kDisableLocalAccounts)) {
+    device_local_account_policy_service_.reset(
+        new DeviceLocalAccountPolicyService(
+            chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
+            chromeos::DeviceSettingsService::Get()));
   }
-
-  InitializeDevicePolicy();
 #endif
 
   // Complete the initialization once the message loops are spinning.
@@ -171,20 +157,11 @@ void BrowserPolicyConnector::Shutdown() {
   g_testing_provider = NULL;
   if (platform_provider_)
     platform_provider_->Shutdown();
-  // The |cloud_provider_| must be shut down before destroying the cloud
-  // policy subsystems, which own the caches that |cloud_provider_| uses.
-  if (cloud_provider_)
-    cloud_provider_->Shutdown();
 
 #if defined(OS_CHROMEOS)
-  // Shutdown device cloud policy.
-  if (device_cloud_policy_subsystem_)
-    device_cloud_policy_subsystem_->Shutdown();
   // The AppPackUpdater may be observing the |device_cloud_policy_subsystem_|.
   // Delete it first.
   app_pack_updater_.reset();
-  device_cloud_policy_subsystem_.reset();
-  device_data_store_.reset();
 
   if (device_cloud_policy_manager_)
     device_cloud_policy_manager_->Shutdown();
@@ -197,13 +174,6 @@ void BrowserPolicyConnector::Shutdown() {
   global_user_cloud_policy_provider_.Shutdown();
 #endif
 
-  // Shutdown user cloud policy.
-  if (user_cloud_policy_subsystem_)
-    user_cloud_policy_subsystem_->Shutdown();
-  user_cloud_policy_subsystem_.reset();
-  user_policy_token_cache_.reset();
-  user_data_store_.reset();
-
   device_management_service_.reset();
 }
 
@@ -228,109 +198,30 @@ PolicyService* BrowserPolicyConnector::GetPolicyService() {
   return policy_service_.get();
 }
 
-void BrowserPolicyConnector::RegisterForDevicePolicy(
-    const std::string& owner_email,
-    const std::string& token,
-    bool known_machine_id,
-    bool reregister) {
 #if defined(OS_CHROMEOS)
-  if (device_data_store_.get()) {
-    if (!device_data_store_->device_token().empty()) {
-      LOG(ERROR) << "Device policy data store already has a DMToken; "
-                 << "RegisterForDevicePolicy won't trigger a new registration.";
-    }
-
-    device_data_store_->set_user_name(owner_email);
-    device_data_store_->set_known_machine_id(known_machine_id);
-    if (reregister) {
-      device_data_store_->set_device_id(install_attributes_->GetDeviceId());
-      device_data_store_->set_reregister(true);
-    }
-    device_data_store_->set_policy_fetching_enabled(false);
-    device_data_store_->SetOAuthToken(token);
-  }
-#endif
-}
-
 bool BrowserPolicyConnector::IsEnterpriseManaged() {
-#if defined(OS_CHROMEOS)
-  return install_attributes_.get() && install_attributes_->IsEnterpriseDevice();
-#else
-  return false;
-#endif
-}
-
-EnterpriseInstallAttributes::LockResult
-    BrowserPolicyConnector::LockDevice(const std::string& user) {
-#if defined(OS_CHROMEOS)
-  if (install_attributes_.get()) {
-    return install_attributes_->LockDevice(user,
-                                           device_data_store_->device_mode(),
-                                           device_data_store_->device_id());
-  }
-#endif
-
-  return EnterpriseInstallAttributes::LOCK_BACKEND_ERROR;
+  return install_attributes_->IsEnterpriseDevice();
 }
 
 std::string BrowserPolicyConnector::GetEnterpriseDomain() {
-#if defined(OS_CHROMEOS)
-  if (install_attributes_.get())
-    return install_attributes_->GetDomain();
-#endif
-
-  return std::string();
+  return install_attributes_->GetDomain();
 }
 
 DeviceMode BrowserPolicyConnector::GetDeviceMode() {
-#if defined(OS_CHROMEOS)
-  if (install_attributes_.get())
-    return install_attributes_->GetMode();
-  else
-    return DEVICE_MODE_NOT_SET;
-#endif
-
-  // We only have the notion of "enterprise" device on ChromeOS for now.
-  return DEVICE_MODE_CONSUMER;
-}
-
-void BrowserPolicyConnector::ResetDevicePolicy() {
-#if defined(OS_CHROMEOS)
-  if (device_cloud_policy_subsystem_.get())
-    device_cloud_policy_subsystem_->Reset();
-#endif
+  return install_attributes_->GetMode();
 }
-
-void BrowserPolicyConnector::FetchCloudPolicy() {
-#if defined(OS_CHROMEOS)
-  if (device_cloud_policy_subsystem_.get())
-    device_cloud_policy_subsystem_->RefreshPolicies(false);
-  if (user_cloud_policy_subsystem_.get())
-    user_cloud_policy_subsystem_->RefreshPolicies(true);  // wait_for_auth_token
 #endif
-}
 
 void BrowserPolicyConnector::ScheduleServiceInitialization(
     int64 delay_milliseconds) {
-  if (device_management_service_.get())
-    device_management_service_->ScheduleInitialization(delay_milliseconds);
-  if (user_cloud_policy_subsystem_.get()) {
-    user_cloud_policy_subsystem_->
-        ScheduleServiceInitialization(delay_milliseconds);
-  }
-#if defined(OS_CHROMEOS)
-  if (device_cloud_policy_subsystem_.get()) {
-    device_cloud_policy_subsystem_->
-        ScheduleServiceInitialization(delay_milliseconds);
-  }
-#endif
+  device_management_service_->ScheduleInitialization(delay_milliseconds);
 }
 
+#if defined(OS_CHROMEOS)
 void BrowserPolicyConnector::InitializeUserPolicy(
     const std::string& user_name,
     bool is_public_account,
     bool wait_for_policy_fetch) {
-#if defined(OS_CHROMEOS)
   // If the user is managed then importing certificates from ONC policy is
   // allowed, otherwise it's not. Update this flag once the user has signed in,
   // and before user policy is loaded.
@@ -342,14 +233,6 @@ void BrowserPolicyConnector::InitializeUserPolicy(
   // (b) Implementing UserCloudPolicyManager::IsInitializationComplete()
   //     correctly is impossible for re-initialization.
   CHECK(!user_cloud_policy_manager_.get());
-#endif
-
-  // Throw away the old backend.
-  user_cloud_policy_subsystem_.reset();
-  user_policy_token_cache_.reset();
-  user_data_store_.reset();
-  token_service_ = NULL;
-  registrar_.RemoveAll();
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
@@ -358,121 +241,39 @@ void BrowserPolicyConnector::InitializeUserPolicy(
 
   FilePath profile_dir;
   PathService::Get(chrome::DIR_USER_DATA, &profile_dir);
-#if defined(OS_CHROMEOS)
   profile_dir = profile_dir.Append(
       command_line->GetSwitchValuePath(switches::kLoginProfile));
-#endif
   const FilePath policy_dir = profile_dir.Append(kPolicyDir);
   const FilePath policy_cache_file = policy_dir.Append(kPolicyCacheFile);
   const FilePath token_cache_file = policy_dir.Append(kTokenCacheFile);
 
-  if (!command_line->HasSwitch(switches::kDisableCloudPolicyService)) {
-#if defined(OS_CHROMEOS)
-    device_management_service_->ScheduleInitialization(startup_delay);
-    if (is_public_account && device_local_account_policy_service_.get()) {
-      device_local_account_policy_provider_.reset(
-          new DeviceLocalAccountPolicyProvider(
-              user_name, device_local_account_policy_service_.get()));
-
-      device_local_account_policy_provider_->Init();
-      global_user_cloud_policy_provider_.SetDelegate(
-          device_local_account_policy_provider_.get());
-    } else if (!IsNonEnterpriseUser(user_name)) {
-      scoped_ptr<CloudPolicyStore> store(
-          new UserCloudPolicyStoreChromeOS(
-              chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
-              user_name, policy_cache_file, token_cache_file));
-      user_cloud_policy_manager_.reset(
-          new UserCloudPolicyManagerChromeOS(store.Pass(),
-                                             wait_for_policy_fetch));
-
-      user_cloud_policy_manager_->Init();
-      user_cloud_policy_manager_->Connect(g_browser_process->local_state(),
-                                          device_management_service_.get(),
-                                          GetUserAffiliation(user_name));
-      global_user_cloud_policy_provider_.SetDelegate(
-          user_cloud_policy_manager_.get());
-    }
-#endif
-  } else {
-    CloudPolicyCacheBase* user_policy_cache = NULL;
-
-    user_data_store_.reset(CloudPolicyDataStore::CreateForUserPolicies());
-#if defined(OS_CHROMEOS)
-    user_policy_cache =
-        new CrosUserPolicyCache(
+  device_management_service_->ScheduleInitialization(startup_delay);
+  if (is_public_account && device_local_account_policy_service_.get()) {
+    device_local_account_policy_provider_.reset(
+        new DeviceLocalAccountPolicyProvider(
+            user_name, device_local_account_policy_service_.get()));
+
+    device_local_account_policy_provider_->Init();
+    global_user_cloud_policy_provider_.SetDelegate(
+        device_local_account_policy_provider_.get());
+  } else if (!IsNonEnterpriseUser(user_name)) {
+    scoped_ptr<CloudPolicyStore> store(
+        new UserCloudPolicyStoreChromeOS(
             chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
-            user_data_store_.get(),
-            wait_for_policy_fetch,
-            token_cache_file,
-            policy_cache_file);
-#else
-    user_policy_cache = new UserPolicyCache(policy_cache_file,
-                                            wait_for_policy_fetch);
-    user_policy_token_cache_.reset(
-        new UserPolicyTokenCache(user_data_store_.get(), token_cache_file));
-
-    // Initiate the DM-Token load.
-    user_policy_token_cache_->Load();
-#endif
-
-    user_cloud_policy_subsystem_.reset(new CloudPolicySubsystem(
-        user_data_store_.get(),
-        user_policy_cache,
-        GetDeviceManagementUrl()));
-
-    user_data_store_->set_user_name(user_name);
-    user_data_store_->set_user_affiliation(GetUserAffiliation(user_name));
-
-    user_cloud_policy_subsystem_->CompleteInitialization(
-        prefs::kUserPolicyRefreshRate,
-        startup_delay);
-
-    cloud_provider_->SetUserPolicyCache(user_policy_cache);
-  }
-}
-
-void BrowserPolicyConnector::SetUserPolicyTokenService(
-    TokenService* token_service) {
-  token_service_ = token_service;
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_TOKEN_AVAILABLE,
-                 content::Source<TokenService>(token_service_));
-
-  if (token_service_->HasTokenForService(
-          GaiaConstants::kDeviceManagementService)) {
-    user_data_store_->SetGaiaToken(token_service_->GetTokenForService(
-        GaiaConstants::kDeviceManagementService));
-  }
-}
-
-void BrowserPolicyConnector::RegisterForUserPolicy(
-    const std::string& oauth_token) {
-  if (oauth_token.empty()) {
-    // An attempt to fetch the dm service oauth token has failed. Notify
-    // the user policy cache of this, so that a potential blocked login
-    // proceeds without waiting for user policy.
-    if (user_cloud_policy_subsystem_.get()) {
-      user_cloud_policy_subsystem_->GetCloudPolicyCacheBase()->
-          SetFetchingDone();
-    }
-  } else {
-    if (user_data_store_.get())
-      user_data_store_->SetOAuthToken(oauth_token);
+            user_name, policy_cache_file, token_cache_file));
+    user_cloud_policy_manager_.reset(
+        new UserCloudPolicyManagerChromeOS(store.Pass(),
+                                           wait_for_policy_fetch));
+
+    user_cloud_policy_manager_->Init();
+    user_cloud_policy_manager_->Connect(g_browser_process->local_state(),
+                                        device_management_service_.get(),
+                                        GetUserAffiliation(user_name));
+    global_user_cloud_policy_provider_.SetDelegate(
+        user_cloud_policy_manager_.get());
   }
 }
-
-CloudPolicyDataStore* BrowserPolicyConnector::GetDeviceCloudPolicyDataStore() {
-#if defined(OS_CHROMEOS)
-  return device_data_store_.get();
-#else
-  return NULL;
 #endif
-}
-
-CloudPolicyDataStore* BrowserPolicyConnector::GetUserCloudPolicyDataStore() {
-  return user_data_store_.get();
-}
 
 const ConfigurationPolicyHandlerList*
     BrowserPolicyConnector::GetHandlerList() const {
@@ -595,58 +396,11 @@ bool BrowserPolicyConnector::IsNonEnterpriseUser(const std::string& username) {
   return false;
 }
 
-void BrowserPolicyConnector::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
-    const TokenService* token_source =
-        content::Source<const TokenService>(source).ptr();
-    DCHECK_EQ(token_service_, token_source);
-    const TokenService::TokenAvailableDetails* token_details =
-        content::Details<const TokenService::TokenAvailableDetails>(details).
-            ptr();
-    if (token_details->service() == GaiaConstants::kDeviceManagementService) {
-      if (user_data_store_.get()) {
-        user_data_store_->SetGaiaToken(token_details->token());
-      }
-    }
-  } else {
-    NOTREACHED();
-  }
-}
-
-void BrowserPolicyConnector::InitializeDevicePolicy() {
-#if defined(OS_CHROMEOS)
-  // Throw away the old backend.
-  device_cloud_policy_subsystem_.reset();
-  device_data_store_.reset();
-
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kDisableCloudPolicyService)) {
-    device_data_store_.reset(CloudPolicyDataStore::CreateForDevicePolicies());
-    DevicePolicyCache* device_policy_cache =
-        new DevicePolicyCache(device_data_store_.get(),
-                              install_attributes_.get());
-
-    cloud_provider_->SetDevicePolicyCache(device_policy_cache);
-
-    device_cloud_policy_subsystem_.reset(new CloudPolicySubsystem(
-        device_data_store_.get(),
-        device_policy_cache,
-        GetDeviceManagementUrl()));
-  }
-#endif
-}
-
 void BrowserPolicyConnector::CompleteInitialization() {
   if (g_testing_provider)
     g_testing_provider->Init();
   if (platform_provider_)
     platform_provider_->Init();
-  if (cloud_provider_)
-    cloud_provider_->Init();
 
 #if defined(OS_CHROMEOS)
   global_user_cloud_policy_provider_.Init();
@@ -656,31 +410,6 @@ void BrowserPolicyConnector::CompleteInitialization() {
   // created only once the loops are running.
   GetAppPackUpdater();
 
-  if (device_cloud_policy_subsystem_.get()) {
-    // Read serial number and machine model. This must be done before we call
-    // CompleteInitialization() below such that the serial number is available
-    // for re-submission in case we're doing serial number recovery.
-    if (device_data_store_->machine_id().empty() ||
-        device_data_store_->machine_model().empty()) {
-      device_data_store_->set_machine_id(
-          DeviceCloudPolicyManagerChromeOS::GetMachineID());
-      device_data_store_->set_machine_model(
-          DeviceCloudPolicyManagerChromeOS::GetMachineModel());
-    }
-
-    device_cloud_policy_subsystem_->CompleteInitialization(
-        prefs::kDevicePolicyRefreshRate,
-        kServiceInitializationStartupDelay);
-  }
-
-  if (device_data_store_.get()) {
-    device_data_store_->set_device_status_collector(
-        new DeviceStatusCollector(
-            g_browser_process->local_state(),
-            chromeos::system::StatisticsProvider::GetInstance(),
-            NULL));
-  }
-
   if (device_cloud_policy_manager_.get()) {
     device_cloud_policy_manager_->Init();
     scoped_ptr<CloudPolicyClient::StatusProvider> status_provider(
@@ -742,8 +471,6 @@ scoped_ptr<PolicyService>
     // |providers| in decreasing order of priority.
     if (platform_provider_)
       providers.push_back(platform_provider_.get());
-    if (cloud_provider_)
-      providers.push_back(cloud_provider_.get());
 
 #if defined(OS_CHROMEOS)
     if (device_cloud_policy_manager_.get())