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 03af03a1b01ef20e4b8fafaea0ba35ee7281722b..17decb07f6036b7c5d2c8e126b6575d08c4d0edc 100644 |
--- a/chrome/browser/policy/browser_policy_connector.cc |
+++ b/chrome/browser/policy/browser_policy_connector.cc |
@@ -8,6 +8,7 @@ |
#include "base/command_line.h" |
#include "base/file_path.h" |
#include "base/path_service.h" |
+#include "chrome/browser/browser_process.h" |
#include "chrome/browser/net/gaia/token_service.h" |
#include "chrome/browser/policy/cloud_policy_provider.h" |
#include "chrome/browser/policy/cloud_policy_provider_impl.h" |
@@ -422,19 +423,21 @@ void BrowserPolicyConnector::InitializeDevicePolicy() { |
// Initialize the subsystem once the message loops are spinning. |
MessageLoop::current()->PostTask( |
FROM_HERE, |
- base::Bind(&BrowserPolicyConnector::InitializeDevicePolicySubsystem, |
+ base::Bind(&BrowserPolicyConnector::CompleteInitialization, |
weak_ptr_factory_.GetWeakPtr())); |
} |
#endif |
} |
-void BrowserPolicyConnector::InitializeDevicePolicySubsystem() { |
+void BrowserPolicyConnector::CompleteInitialization() { |
#if defined(OS_CHROMEOS) |
if (device_cloud_policy_subsystem_.get()) { |
device_cloud_policy_subsystem_->CompleteInitialization( |
prefs::kDevicePolicyRefreshRate, |
kServiceInitializationStartupDelay); |
} |
+ device_data_store_->set_device_status_collector( |
+ new DeviceStatusCollector(g_browser_process->local_state())); |
#endif |
} |