Hook up DomStorageArea with a DomStorageDatabase.

webkit/dom_storage/dom_storage_area.h

 // Copyright (c) 2012 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.
 
 #ifndef WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_
 #define WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_
 #pragma once
 
 #include "base/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/nullable_string16.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/dom_storage/dom_storage_task_runner.h"

[michaeln, 2012/02/15 04:10:53]

thnx for cleaning up this include

-
-class FilePath;
-class GURL;
+#include "webkit/dom_storage/dom_storage_database.h"
+#include "webkit/dom_storage/dom_storage_types.h"
 
 namespace dom_storage {
 
 class DomStorageMap;
+class DomStorageTaskRunner;
 
 // Container for a per-origin Map of key/value pairs potentially
 // backed by storage on disk and lazily commits changes to disk.
 // See class comments for DomStorageContext for a larger overview.
 class DomStorageArea
     : public base::RefCountedThreadSafe<DomStorageArea> {
 
  public:
   DomStorageArea(int64 namespace_id,
                  const GURL& origin,
                  const FilePath& directory,
                  DomStorageTaskRunner* task_runner);
 
   const GURL& origin() const { return origin_; }
   int64 namespace_id() const { return namespace_id_; }
 
   unsigned Length();
   NullableString16 Key(unsigned index);
   NullableString16 GetItem(const string16& key);
   bool SetItem(const string16& key, const string16& value,
                NullableString16* old_value);
   bool RemoveItem(const string16& key, string16* old_value);
   bool Clear();
 
   DomStorageArea* ShallowCopy(int64 destination_namespace_id);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, DomStorageAreaBasics);
+  FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, BackingDatabaseOpened);
+  FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, TestDatabaseFilePath);
   friend class base::RefCountedThreadSafe<DomStorageArea>;
 
+  // If we haven't done so already and this is a local storage area,
+  // will attempt to read any values for this origin currently
+  // stored on disk.
+  void InitialImportIfNeeded();
+
+  // Posts a task to write the set of changed values to disk.
+  void ScheduleCommitChanges();
+  void CommitChanges();
+
+  static FilePath DatabaseFileNameFromOrigin(const GURL& origin);
+
   ~DomStorageArea();
 
   int64 namespace_id_;
   GURL origin_;
   FilePath directory_;
   scoped_refptr<DomStorageTaskRunner> task_runner_;
   scoped_refptr<DomStorageMap> map_;
-  // TODO(benm): integrate with DomStorageDatabase to read from
-  // and lazily write to disk.
+  scoped_ptr<DomStorageDatabase> backing_;
+  bool initial_import_done_;
+  ValuesMap changed_values_;
+  bool clear_all_next_commit_;
 };
 
 }  // namespace dom_storage
 
 #endif  // WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_