Signed settings refactoring: Proper caching and more tests.

chrome/browser/chromeos/login/ownership_service.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/chromeos/login/ownership_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 12 matching lines @@
     LAZY_INSTANCE_INITIALIZER;
 
 //  static
 OwnershipService* OwnershipService::GetSharedInstance() {
   return g_ownership_service.Pointer();
 }
 
 OwnershipService::OwnershipService()
     : manager_(new OwnerManager),
       utils_(OwnerKeyUtils::Create()),
-      policy_(NULL),
       ownership_status_(OWNERSHIP_UNKNOWN) {
   notification_registrar_.Add(
       this,
       chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED,
       content::NotificationService::AllSources());
 }
 
 OwnershipService::~OwnershipService() {}
 
 void OwnershipService::Prewarm() {
   // Note that we cannot prewarm in constructor because in current codebase
   // object is created before spawning threads.
   if (g_ownership_service == this) {
     // Start getting ownership status.
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&OwnershipService::FetchStatus, base::Unretained(this)));
   } else {
     // This can happen only for particular test: OwnershipServiceTest. It uses
     // mocks and for that uses OwnershipService not as a regular singleton but
     // as a resurrecting object. This behaviour conflicts with
     // DISABLE_RUNNABLE_METHOD_REFCOUNT.  So avoid posting task in those
     // circumstances in order to avoid accessing already deleted object.
   }
 }
 
-void OwnershipService::set_cached_policy(const em::PolicyData& pol) {
-  policy_.reset(pol.New());
-  policy_->CheckTypeAndMergeFrom(pol);
-}
-
-bool OwnershipService::has_cached_policy() {
-  return policy_.get();
-}
-
-const em::PolicyData& OwnershipService::cached_policy() {
-  return *(policy_.get());
-}
-
 bool OwnershipService::IsAlreadyOwned() {
   return file_util::PathExists(utils_->GetOwnerKeyFilePath());
 }
 
 OwnershipService::Status OwnershipService::GetStatus(bool blocking) {
   Status status = OWNERSHIP_UNKNOWN;
   bool is_owned = false;
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     ownership_status_lock_.Acquire();
     status = ownership_status_;
@@ skipping 137 matching lines @@
   SetStatus(status);
 }
 
 void OwnershipService::SetStatus(Status new_status) {
   DCHECK(new_status == OWNERSHIP_TAKEN || new_status == OWNERSHIP_NONE);
   base::AutoLock lk(ownership_status_lock_);
   ownership_status_ = new_status;
 }
 
 }  // namespace chromeos