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

content/public/browser/session_storage_namespace.h

Index: content/public/browser/session_storage_namespace.h
diff --git a/content/public/browser/session_storage_namespace.h b/content/public/browser/session_storage_namespace.h
index 374b7b050fb8666437befe0145b09948a5fd32da..78110af9caf1a3c55f923744f881750afed1d751 100644
--- a/content/public/browser/session_storage_namespace.h
+++ b/content/public/browser/session_storage_namespace.h
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
 #include "base/memory/ref_counted.h"
 
 namespace content {
@@ -33,48 +32,6 @@ class SessionStorageNamespace
 
   virtual bool should_persist() const = 0;
 
-  // SessionStorageNamespaces can be merged. These merges happen based on
-  // a transaction log of operations on the session storage namespace since
-  // this function has been called. Transaction logging will be restricted
-  // to the processes indicated.
-  virtual void AddTransactionLogProcessId(int process_id) = 0;
-
-  // When transaction logging for a process is no longer required, the log
-  // can be removed to save space.
-  virtual void RemoveTransactionLogProcessId(int process_id) = 0;
-
-  // Creates a new session storage namespace which is an alias of the current
-  // instance.
-  virtual SessionStorageNamespace* CreateAlias() = 0;
-
-  enum MergeResult {
-    MERGE_RESULT_NAMESPACE_NOT_FOUND,
-    MERGE_RESULT_NAMESPACE_NOT_ALIAS,
-    MERGE_RESULT_NOT_LOGGING,
-    MERGE_RESULT_NO_TRANSACTIONS,
-    MERGE_RESULT_TOO_MANY_TRANSACTIONS,
-    MERGE_RESULT_NOT_MERGEABLE,
-    MERGE_RESULT_MERGEABLE,
-    MERGE_RESULT_MAX_VALUE
-  };
-
-  typedef base::Callback<void(MergeResult)> MergeResultCallback;
-
-  // Determines whether the transaction log for the process specified can
-  // be merged into the other session storage namespace supplied.
-  // If actually_merge is set to true, the merge will actually be performed,
-  // if possible, and the result of the merge will be returned.
-  // If actually_merge is set to false, the result of whether a merge would be
-  // possible is returned.
-  virtual void Merge(bool actually_merge,
-                     int process_id,
-                     SessionStorageNamespace* other,
-                     const MergeResultCallback& callback) = 0;
-
-  // Indicates whether this SessionStorageNamespace is an alias of |other|,
-  // i.e. whether they point to the same underlying data.
-  virtual bool IsAliasOf(SessionStorageNamespace* other) = 0;
-
  protected:
   friend class base::RefCountedThreadSafe<SessionStorageNamespace>;
   virtual ~SessionStorageNamespace() {}