Signed settings refactoring: Proper caching and more tests.

chrome/browser/chromeos/login/ownership_service.h

Index: chrome/browser/chromeos/login/ownership_service.h
diff --git a/chrome/browser/chromeos/login/ownership_service.h b/chrome/browser/chromeos/login/ownership_service.h
index 458009fcb95ba8bec7bc236c487696fa84fd1214..e22bcfd1400faebd0043f683adff2b7595d24f1b 100644
--- a/chrome/browser/chromeos/login/ownership_service.h
+++ b/chrome/browser/chromeos/login/ownership_service.h
@@ -16,7 +16,6 @@
 #include "base/synchronization/lock.h"
 #include "chrome/browser/chromeos/login/owner_key_utils.h"
 #include "chrome/browser/chromeos/login/owner_manager.h"
-#include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -25,7 +24,6 @@ namespace base {
 template <typename T> struct DefaultLazyInstanceTraits;
 }
 
-namespace em = enterprise_management;
 namespace chromeos {
 
 class OwnershipService : public content::NotificationObserver {
@@ -45,17 +43,6 @@ class OwnershipService : public content::NotificationObserver {
   // blocking on UI thread.
   void Prewarm();
 
-  // Owner settings are being re-implemented as a single, signed protobuf
-  // that is stored by the session manager.  Thus, to write a setting, you
-  // need to have the existing policy, update it, re-sign it, and then have
-  // it stored.  This could be done by requesting the policy every time, or
-  // by caching it and updating it upon every successful store.
-  // Caching is faster and easier, so we'll do that.  These are the
-  // getters/setters for the cached policy.
-  virtual void set_cached_policy(const em::PolicyData& pol);
-  virtual bool has_cached_policy();
-  virtual const em::PolicyData& cached_policy();
-
   // Sets a new owner key. This will _not_ load the key material from disk, but
   // rather update Chrome's in-memory copy of the key. |callback| will be
   // invoked once the operation completes.
@@ -139,7 +126,6 @@ class OwnershipService : public content::NotificationObserver {
 
   scoped_refptr<OwnerManager> manager_;
   scoped_refptr<OwnerKeyUtils> utils_;
-  scoped_ptr<em::PolicyData> policy_;
   content::NotificationRegistrar notification_registrar_;
   volatile Status ownership_status_;
   base::Lock ownership_status_lock_;