Rework the device management backend implementation.

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 69a0a68720df8da5040cfbe307a3bae878072ef3..35246575ff2ddf72d58d046a72d8de08cb25dd1b 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -58,6 +58,7 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
+#include "chrome/browser/policy/device_management_backend_impl.h"

[danno, 2010/11/16 22:02:56]

alphabetize

[Mattias Nissler (ping if slow), 2010/11/19 17:21:53]

Done.

 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
@@ -1335,6 +1336,9 @@ int BrowserMain(const MainFunctionParams& parameters) {
 
   // Post-profile init ---------------------------------------------------------
 
+  scoped_ptr<policy::DeviceManagementBackendImpl> device_management_backend(
+      policy::DeviceManagementBackendImpl::Initialize(profile));
+
   PrefService* user_prefs = profile->GetPrefs();
   DCHECK(user_prefs);
 
@@ -1661,6 +1665,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
   process_singleton.Cleanup();
 
   metrics->Stop();
+  device_management_backend.reset();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.