Some fleshing out the mojo based localstorage implementation.

content/renderer/dom_storage/local_storage_cached_area.h

Index: content/renderer/dom_storage/local_storage_cached_area.h
diff --git a/content/renderer/dom_storage/local_storage_cached_area.h b/content/renderer/dom_storage/local_storage_cached_area.h
index b17e299c3ce872580d883d9589b9bc19e74fe40c..0ff8962e91924605f58cc09645df9f8c86eb3c8d 100644
--- a/content/renderer/dom_storage/local_storage_cached_area.h
+++ b/content/renderer/dom_storage/local_storage_cached_area.h
@@ -60,6 +60,9 @@ class LocalStorageCachedArea : public LevelDBObserver,
   ~LocalStorageCachedArea() override;
 
   // LevelDBObserver:
+  void KeyAdded(mojo::Array<uint8_t> key,
+                mojo::Array<uint8_t> value,
+                const mojo::String& source) override;
   void KeyChanged(mojo::Array<uint8_t> key,
                   mojo::Array<uint8_t> new_value,
                   mojo::Array<uint8_t> old_value,
@@ -68,28 +71,35 @@ class LocalStorageCachedArea : public LevelDBObserver,
                   mojo::Array<uint8_t> old_value,
                   const mojo::String& source) override;
   void AllDeleted(const mojo::String& source) override;
+  void GetAllComplete(uint64_t request_id) override;
+
+  // Common helper for KeyAdded() and KeyChanged()
+  void KeyAddedOrChanged(mojo::Array<uint8_t> key,
+                         mojo::Array<uint8_t> new_value,
+                         base::NullableString16& old_value,
+                         const mojo::String& source);
 
   // Synchronously fetches the origin's local storage data if it hasn't been
   // fetched already.
   void EnsureLoaded();
 
-  void OnSetItemComplete(const base::string16& key,
-                         leveldb::DatabaseError result);
-  void OnRemoveItemComplete(const base::string16& key,
-                            leveldb::DatabaseError result);
-  void OnClearComplete(leveldb::DatabaseError result);
+  void OnSetItemComplete(const base::string16& key, bool success);
+  void OnRemoveItemComplete(const base::string16& key, bool success);
+  void OnClearComplete(bool success);
 
   // Resets the object back to its newly constructed state.
   void Reset();
 
-  bool loaded_;
   url::Origin origin_;
   scoped_refptr<DOMStorageMap> map_;
   std::map<base::string16, int> ignore_key_mutations_;
+  bool ignore_all_mutations_ = false;
+  uint64_t get_all_request_id_ = UINT64_C(0);
   LevelDBWrapperPtr leveldb_;
   mojo::Binding<LevelDBObserver> binding_;
   LocalStorageCachedAreas* cached_areas_;
   std::map<std::string, LocalStorageArea*> areas_;
+  base::WeakPtrFactory<LocalStorageCachedArea> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalStorageCachedArea);
 };