Support policies referencing external data for device-local accounts

chrome/browser/policy/cloud/cloud_external_data_manager.cc

Index: chrome/browser/policy/cloud/cloud_external_data_manager.cc
diff --git a/chrome/browser/policy/cloud/cloud_external_data_manager.cc b/chrome/browser/policy/cloud/cloud_external_data_manager.cc
index 6f91e060f6fbe41f9fbb087f985fc829e0352757..797ffd0d00071a009f5a709b81312cc555b17841 100644
--- a/chrome/browser/policy/cloud/cloud_external_data_manager.cc
+++ b/chrome/browser/policy/cloud/cloud_external_data_manager.cc
@@ -31,6 +31,7 @@ CloudExternalDataManager::~CloudExternalDataManager() {
 }
 
 void CloudExternalDataManager::SetPolicyStore(CloudPolicyStore* policy_store) {
+  weak_factory_.InvalidateWeakPtrs();

[Joao da Silva, 2013/11/04 09:16:51]

Why?

[bartfab (slow), 2013/11/04 16:03:47]

This method is meant for connecting a store to the manager and for disconnecting
it again. The disconnecting part was not working correctly. When you disconnect
(by passing NULL), the manager would forget about the store but the store would
still have a WeakPtr to the manager. This never was an issue before because the
store and manager had very similar lifetimes. Now that their lifetimes are
decoupled, reliable disconnecting is necessary.

   policy_store_ = policy_store;
   if (policy_store_)
     policy_store_->SetExternalDataManager(weak_factory_.GetWeakPtr());