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

content/browser/dom_storage/dom_storage_session.h

Index: content/browser/dom_storage/dom_storage_session.h
diff --git a/content/browser/dom_storage/dom_storage_session.h b/content/browser/dom_storage/dom_storage_session.h
index 5e126216c60cd4a8954bc99cf2f42c2e4512fdcd..62c6d97252c0a2ddcbe33ed1899b60b50407cdab 100644
--- a/content/browser/dom_storage/dom_storage_session.h
+++ b/content/browser/dom_storage/dom_storage_session.h
@@ -9,7 +9,6 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/common/content_export.h"
 
 namespace content {
@@ -31,10 +30,6 @@ class CONTENT_EXPORT DOMStorageSession
   DOMStorageSession(DOMStorageContextImpl* context,
                     const std::string& persistent_namespace_id);
 
-  // Constructs a |DOMStorageSession| as an alias of
-  // |master_dom_storage_session|. Allocates a new non-persistent ID.
-  explicit DOMStorageSession(DOMStorageSession* master_dom_storage_session);
-
   int64 namespace_id() const { return namespace_id_; }
   const std::string& persistent_namespace_id() const {
     return persistent_namespace_id_;
@@ -49,13 +44,6 @@ class CONTENT_EXPORT DOMStorageSession
   static DOMStorageSession* CloneFrom(DOMStorageContextImpl* context,
                                       int64 namepace_id_to_clone);
 
-  void AddTransactionLogProcessId(int process_id);
-  void RemoveTransactionLogProcessId(int process_id);
-  void Merge(bool actually_merge,
-             int process_id,
-             DOMStorageSession* other,
-             const SessionStorageNamespace::MergeResultCallback& callback);
-
  private:
   friend class base::RefCountedThreadSafe<DOMStorageSession>;
 
@@ -64,12 +52,6 @@ class CONTENT_EXPORT DOMStorageSession
                     const std::string& persistent_namespace_id);
   ~DOMStorageSession();
 
-  void ProcessMergeResult(
-      bool actually_merge,
-      const SessionStorageNamespace::MergeResultCallback& callback,
-      const std::string& new_persistent_namespace_id,
-      SessionStorageNamespace::MergeResult result);
-
   scoped_refptr<DOMStorageContextImpl> context_;
   int64 namespace_id_;
   std::string persistent_namespace_id_;