Consolidate data storage and notifications in the cloud policy subsystem

chrome/browser/policy/user_policy_token_cache.cc

 // Copyright (c) 2011 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/policy/user_policy_token_cache.h"
 
 #include "base/file_util.h"
 #include "content/browser/browser_thread.h"
 
 namespace policy {
 
 namespace em = enterprise_management;
 
-UserPolicyTokenCache::Delegate::~Delegate() {}
-
 UserPolicyTokenCache::UserPolicyTokenCache(
-    const base::WeakPtr<Delegate>& delegate,
+    CloudPolicyData* data,
     const FilePath& cache_file)
-    : delegate_(delegate),
-      cache_file_(cache_file) {}
+    : data_(data),
+      cache_file_(cache_file) {
+  data_->AddObserver(this);
+}
 
 void UserPolicyTokenCache::Load() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this, &UserPolicyTokenCache::LoadOnFileThread));
 }
 
 void UserPolicyTokenCache::Store(const std::string& token,
                                  const std::string& device_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &UserPolicyTokenCache::StoreOnFileThread,
                         token,
                         device_id));
 }
 
 UserPolicyTokenCache::~UserPolicyTokenCache() {
+  if (data_ != NULL)
+    data_->RemoveObserver(this);
 }
 
 void UserPolicyTokenCache::LoadOnFileThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   std::string device_token;
   std::string device_id;
 
   if (file_util::PathExists(cache_file_)) {
     std::string data;
     em::DeviceCredentials device_credentials;
     if (file_util::ReadFileToString(cache_file_, &data) &&
         device_credentials.ParseFromArray(data.c_str(), data.size())) {
       device_token = device_credentials.device_token();
       device_id = device_credentials.device_id();
     }
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this,
                         &UserPolicyTokenCache::NotifyOnUIThread,
                         device_token,
                         device_id));
 }
 
 void UserPolicyTokenCache::NotifyOnUIThread(const std::string& token,
                                             const std::string& device_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (delegate_.get())
-    delegate_->OnTokenCacheLoaded(token, device_id);
+  data_->set_device_id(device_id);

[pastarmovj, 2011/07/06 12:11:57]

Is it secure to assume data_ is not NULL here always?

[gfeher, 2011/07/06 15:14:20]

Good point. Done.

+  data_->SetDeviceToken(token, true);
+  data_->NotifyDeviceTokenChanged();
 }
 
 void UserPolicyTokenCache::StoreOnFileThread(const std::string& token,
                                              const std::string& device_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   em::DeviceCredentials device_credentials;
   device_credentials.set_device_token(token);
   device_credentials.set_device_id(device_id);
   std::string data;
   bool success = device_credentials.SerializeToString(&data);
   if (!success) {
     LOG(WARNING) << "Failed serialize device token data, will not write "
                  << cache_file_.value();
     return;
   }
 
   if (!file_util::CreateDirectory(cache_file_.DirName())) {
     LOG(WARNING) << "Failed to create directory "
                  << cache_file_.DirName().value();
     return;
   }
 
   file_util::WriteFile(cache_file_, data.c_str(), data.length());
 }
 
+void UserPolicyTokenCache::OnDeviceTokenChanged() {
+  if (!data_->device_token().empty() &&
+      !data_->device_id().empty()) {
+    // This will also happen after loading the cache.
+    Store(data_->device_token(), data_->device_id());
+  }
+}
+
+void UserPolicyTokenCache::OnCredentialsChanged() {
+}
+
+void UserPolicyTokenCache::OnPolicyDataGoingAway() {
+  data_->RemoveObserver(this);
+  data_ = NULL;
+}
+
 }  // namespace policy