Move DeviceManagementPolicyProvider into the profile.

chrome/browser/profile_impl.cc

 // Copyright (c) 2010 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/profile_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 36 matching lines @@
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/net/net_pref_observer.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/password_manager/password_store_default.h"
+#include "chrome/browser/policy/configuration_policy_provider.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"
+#include "chrome/browser/policy/device_management_backend_impl.h"
+#include "chrome/browser/policy/device_management_policy_provider.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/spellcheck_host.h"
@@ skipping 436 matching lines @@
 
   // The theme provider provides bitmaps to whoever wants them.
   theme_provider_.reset();
 
   // Remove pref observers
   pref_change_registrar_.RemoveAll();
 
   // Delete the NTP resource cache so we can unregister pref observers.
   ntp_resource_cache_.reset();
 
+  // Shut down the DM policy provider before the token service dies.
+  if (device_management_policy_provider_.get())
+    device_management_policy_provider_->Shutdown();
+
   // The sync service needs to be deleted before the services it calls.
   sync_service_.reset();
 
   // Both HistoryService and WebDataService maintain threads for background
   // processing. Its possible each thread still has tasks on it that have
   // increased the ref count of the service. In such a situation, when we
   // decrement the refcount, it won't be 0, and the threads/databases aren't
   // properly shut down. By explicitly calling Cleanup/Shutdown we ensure the
   // databases are properly closed.
   if (web_data_service_.get())
@@ skipping 781 matching lines @@
         NewRunnableMethod(blob_storage_context_.get(),
                           &ChromeBlobStorageContext::InitializeOnIOThread));
   }
   return blob_storage_context_;
 }
 
 ExtensionInfoMap* ProfileImpl::GetExtensionInfoMap() {
   return extension_info_map_.get();
 }
 
+policy::DeviceManagementPolicyProvider*
+ProfileImpl::GetDeviceManagementPolicyProvider() {
+  if (!device_management_policy_provider_.get()) {
+    CommandLine* command_line = CommandLine::ForCurrentProcess();
+    if (command_line->HasSwitch(switches::kDeviceManagementUrl)) {
+      device_management_policy_provider_.reset(
+          new policy::DeviceManagementPolicyProvider(
+              policy::ConfigurationPolicyPrefStore::
+                  GetChromePolicyDefinitionList(),
+              new policy::DeviceManagementBackendImpl(
+                  command_line->GetSwitchValueASCII(
+                      switches::kDeviceManagementUrl)),
+              GetTokenService(),
+              GetPath()));
+    }
+  }

[Nico, 2010/11/18 14:34:24]

I like early exits, they lead to less "indenty" code:

  CommandLine* command_line = CommandLine::ForCurrentProcess();
  if (!command_line->HasSwitch(switches::kDeviceManagementUrl))
    return NULL;

// ...rest

[Mattias Nissler (ping if slow), 2010/11/18 15:08:16]

Yay, me too! But there are many people who don't. Changed anyways :)

+  return device_management_policy_provider_.get();
+}
+
 PromoCounter* ProfileImpl::GetInstantPromoCounter() {
 #if defined(OS_WIN)
   // TODO: enable this when we're ready to turn on the promo.
   /*
   if (!checked_instant_promo_) {
     checked_instant_promo_ = true;
     PrefService* prefs = GetPrefs();
     if (!prefs->GetBoolean(prefs::kInstantEnabledOnce) &&
         !InstantController::IsEnabled(this) &&
         InstallUtil::IsChromeSxSProcess()) {
@@ skipping 12 matching lines @@
 #if defined(OS_CHROMEOS)
 chromeos::ProxyConfigServiceImpl*
     ProfileImpl::GetChromeOSProxyConfigServiceImpl() {
   if (!chromeos_proxy_config_service_impl_) {
     chromeos_proxy_config_service_impl_ =
         new chromeos::ProxyConfigServiceImpl();
   }
   return chromeos_proxy_config_service_impl_;
 }
 #endif  // defined(OS_CHROMEOS)