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

content/browser/dom_storage/dom_storage_context_impl.h

Index: content/browser/dom_storage/dom_storage_context_impl.h
diff --git a/content/browser/dom_storage/dom_storage_context_impl.h b/content/browser/dom_storage/dom_storage_context_impl.h
index bd1acbfba222ec29f4ad74112faa5c1981417416..4470df569ecff6d73dde2473b4b5da98172356e0 100644
--- a/content/browser/dom_storage/dom_storage_context_impl.h
+++ b/content/browser/dom_storage/dom_storage_context_impl.h
@@ -16,9 +16,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
-#include "content/browser/dom_storage/dom_storage_namespace.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/session_storage_namespace.h"
 #include "url/gurl.h"
 
 namespace base {
@@ -34,6 +32,7 @@ class SpecialStoragePolicy;
 namespace content {
 
 class DOMStorageArea;
+class DOMStorageNamespace;
 class DOMStorageSession;
 class DOMStorageTaskRunner;
 class SessionStorageDatabase;
@@ -81,9 +80,6 @@ class CONTENT_EXPORT DOMStorageContextImpl
     virtual void OnDOMStorageAreaCleared(
         const DOMStorageArea* area,
         const GURL& page_url) = 0;
-    // Indicates that cached values of the DOM Storage provided must be
-    // cleared and retrieved again.
-    virtual void OnDOMSessionStorageReset(int64 namespace_id) = 0;
 
    protected:
     virtual ~EventObserver() {}
@@ -135,7 +131,6 @@ class CONTENT_EXPORT DOMStorageContextImpl
   // Methods to add, remove, and notify EventObservers.
   void AddEventObserver(EventObserver* observer);
   void RemoveEventObserver(EventObserver* observer);
-
   void NotifyItemSet(
       const DOMStorageArea* area,
       const base::string16& key,
@@ -150,9 +145,6 @@ class CONTENT_EXPORT DOMStorageContextImpl
   void NotifyAreaCleared(
       const DOMStorageArea* area,
       const GURL& page_url);
-  void NotifyAliasSessionMerged(
-      int64 namespace_id,
-      DOMStorageNamespace* old_alias_master_namespace);
 
   // May be called on any thread.
   int64 AllocateSessionId() {
@@ -167,8 +159,6 @@ class CONTENT_EXPORT DOMStorageContextImpl
   void DeleteSessionNamespace(int64 namespace_id, bool should_persist_data);
   void CloneSessionNamespace(int64 existing_id, int64 new_id,
                              const std::string& new_persistent_id);
-  void CreateAliasSessionNamespace(int64 existing_id, int64 new_id,
-                                   const std::string& persistent_id);
 
   // Starts backing sessionStorage on disk. This function must be called right
   // after DOMStorageContextImpl is created, before it's used.
@@ -179,13 +169,6 @@ class CONTENT_EXPORT DOMStorageContextImpl
   // unclean exit.
   void StartScavengingUnusedSessionStorage();
 
-  void AddTransactionLogProcessId(int64 namespace_id, int process_id);
-  void RemoveTransactionLogProcessId(int64 namespace_id, int process_id);
-
-  SessionStorageNamespace::MergeResult MergeSessionStorage(
-      int64 namespace1_id, bool actually_merge, int process_id,
-      int64 namespace2_id);
-
  private:
   friend class DOMStorageContextImplTest;
   FRIEND_TEST_ALL_PREFIXES(DOMStorageContextImplTest, Basics);
@@ -193,12 +176,10 @@ class CONTENT_EXPORT DOMStorageContextImpl
   typedef std::map<int64, scoped_refptr<DOMStorageNamespace> >
       StorageNamespaceMap;
 
-  virtual ~DOMStorageContextImpl();
+  ~DOMStorageContextImpl();
 
   void ClearSessionOnlyOrigins();
 
-  void MaybeShutdownSessionNamespace(DOMStorageNamespace* ns);
-
   // For scavenging unused sessionStorages.
   void FindUnusedNamespaces();
   void FindUnusedNamespacesInCommitSequence(