Split up extensions storage API implementations for sync and local storage.

chrome/browser/extensions/api/storage/local_value_store_cache.h

Index: chrome/browser/extensions/api/storage/local_value_store_cache.h
diff --git a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.h b/chrome/browser/extensions/api/storage/local_value_store_cache.h
similarity index 42%
copy from chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.h
copy to chrome/browser/extensions/api/storage/local_value_store_cache.h
index 4cd9e37d8b183172dded552f7e4cc8d4f58dbe18..405458cd7e0f992b2c2d0361e680aed794c2e29c 100644
--- a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.h
+++ b/chrome/browser/extensions/api/storage/local_value_store_cache.h
@@ -2,68 +2,48 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_SYNC_OR_LOCAL_VALUE_STORE_CACHE_H_
-#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_SYNC_OR_LOCAL_VALUE_STORE_CACHE_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_LOCAL_VALUE_STORE_CACHE_H_
+#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_LOCAL_VALUE_STORE_CACHE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/extensions/api/storage/settings_observer.h"
-#include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"
 #include "chrome/browser/extensions/api/storage/value_store_cache.h"
-#include "sync/api/syncable_service.h"
 
 namespace base {
 class FilePath;
 }
 
-namespace syncer {
-class SyncableService;
-}
-
 namespace extensions {
 
 class SettingsBackend;
 class SettingsStorageFactory;
 
-// ValueStoreCache for the LOCAL and SYNC namespaces. It owns a backend for
-// apps and another for extensions. Each backend takes care of persistence and
-// syncing.
-class SyncOrLocalValueStoreCache : public ValueStoreCache {
+// ValueStoreCache for the LOCAL namespace. It owns a backend for apps and
+// another for extensions. Each backend takes care of persistence.
+class LocalValueStoreCache : public ValueStoreCache {
  public:
-  SyncOrLocalValueStoreCache(
-      settings_namespace::Namespace settings_namespace,
-      const scoped_refptr<SettingsStorageFactory>& factory,
-      const SettingsStorageQuotaEnforcer::Limits& quota,
-      const scoped_refptr<SettingsObserverList>& observers,
-      const base::FilePath& profile_path);
-  virtual ~SyncOrLocalValueStoreCache();
-
-  syncer::SyncableService* GetSyncableService(syncer::ModelType type) const;
+  LocalValueStoreCache(const scoped_refptr<SettingsStorageFactory>& factory,
+                       const base::FilePath& profile_path);
+  virtual ~LocalValueStoreCache();
 
   // ValueStoreCache implementation:
-
   virtual void RunWithValueStoreForExtension(
       const StorageCallback& callback,
       scoped_refptr<const Extension> extension) OVERRIDE;
-
   virtual void DeleteStorageSoon(const std::string& extension_id) OVERRIDE;
 
  private:
   void InitOnFileThread(const scoped_refptr<SettingsStorageFactory>& factory,
-                        const SettingsStorageQuotaEnforcer::Limits& quota,
-                        const scoped_refptr<SettingsObserverList>& observers,
                         const base::FilePath& profile_path);
 
-  settings_namespace::Namespace settings_namespace_;
-  bool initialized_;

[James Cook, 2014/03/05 18:37:39]

I removed this because it was only used for DCHECKs and the existence of a
non-null app_backend_ or extension_backend_ implies the class was initialized.

[Devlin, 2014/03/05 19:02:55]

I think I'd still like this.  You're right that non-null implies the class was
initialized, but DCHECK(initialized_) is faster and cleaner than 

DCHECK(app_backend_.get());
DCHECK(extension_backend_.get());

and I think the DCHECKs in general were useful.

See also other comments.

[James Cook, 2014/03/05 23:14:28]

OK, added initialized_ back.

   scoped_ptr<SettingsBackend> app_backend_;
   scoped_ptr<SettingsBackend> extension_backend_;
 
-  DISALLOW_COPY_AND_ASSIGN(SyncOrLocalValueStoreCache);
+  DISALLOW_COPY_AND_ASSIGN(LocalValueStoreCache);
 };
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_API_STORAGE_SYNC_OR_LOCAL_VALUE_STORE_CACHE_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_API_STORAGE_LOCAL_VALUE_STORE_CACHE_H_