[Tests not passing yet] Remove prerender sessionStorage namespace merging.

content/browser/dom_storage/dom_storage_host.h

Index: content/browser/dom_storage/dom_storage_host.h
diff --git a/content/browser/dom_storage/dom_storage_host.h b/content/browser/dom_storage/dom_storage_host.h
index 10d59198f23c0515c1d649f7d3647a599245b4bc..bf3bab75881e8d153831e4fcf9b589660044b8a1 100644
--- a/content/browser/dom_storage/dom_storage_host.h
+++ b/content/browser/dom_storage/dom_storage_host.h
@@ -10,7 +10,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/string16.h"
-#include "content/browser/dom_storage/dom_storage_namespace.h"
 #include "content/common/content_export.h"
 #include "content/common/dom_storage/dom_storage_types.h"
 
@@ -24,20 +23,19 @@ class DOMStorageNamespace;
 class DOMStorageArea;
 
 // One instance is allocated in the main process for each client process.
-// Used by DOMStorageMessageFilter in Chrome.
+// Used by DOMStorageMessageFilter in Chrome and by SimpleDOMStorage in DRT.
 // This class is single threaded, and performs blocking file reads/writes,
 // so it shouldn't be used on chrome's IO thread.
 // See class comments for DOMStorageContextImpl for a larger overview.
 class CONTENT_EXPORT DOMStorageHost {
  public:
-  DOMStorageHost(DOMStorageContextImpl* context, int render_process_id);
+  explicit DOMStorageHost(DOMStorageContextImpl* context);
   ~DOMStorageHost();
 
   bool OpenStorageArea(int connection_id, int namespace_id,
                        const GURL& origin);
   void CloseStorageArea(int connection_id);
-  bool ExtractAreaValues(int connection_id, DOMStorageValuesMap* map,
-                         bool* send_log_get_messages);
+  bool ExtractAreaValues(int connection_id, DOMStorageValuesMap* map);
   unsigned GetAreaLength(int connection_id);
   base::NullableString16 GetAreaKey(int connection_id, unsigned index);
   base::NullableString16 GetAreaItem(int connection_id,
@@ -45,17 +43,11 @@ class CONTENT_EXPORT DOMStorageHost {
   bool SetAreaItem(int connection_id, const base::string16& key,
                    const base::string16& value, const GURL& page_url,
                    base::NullableString16* old_value);
-  void LogGetAreaItem(int connection_id, const base::string16& key,
-                      const base::NullableString16& value);
   bool RemoveAreaItem(int connection_id, const base::string16& key,
                   const GURL& page_url,
                   base::string16* old_value);
   bool ClearArea(int connection_id, const GURL& page_url);
-  bool HasAreaOpen(int64 namespace_id, const GURL& origin,
-                   int64* alias_namespace_id) const;
-  // Resets all open areas for the namespace provided. Returns true
-  // iff there were any areas to reset.
-  bool ResetOpenAreasForNamespace(int64 namespace_id);
+  bool HasAreaOpen(int namespace_id, const GURL& origin) const;
 
  private:
   // Struct to hold references needed for areas that are open
@@ -70,17 +62,9 @@ class CONTENT_EXPORT DOMStorageHost {
 
   DOMStorageArea* GetOpenArea(int connection_id);
   DOMStorageNamespace* GetNamespace(int connection_id);
-  void MaybeLogTransaction(
-      int connection_id,
-      DOMStorageNamespace::LogType transaction_type,
-      const GURL& origin,
-      const GURL& page_url,
-      const base::string16& key,
-      const base::NullableString16& value);
 
   scoped_refptr<DOMStorageContextImpl> context_;
   AreaMap connections_;
-  int render_process_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DOMStorageHost);
 };