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

content/browser/dom_storage/dom_storage_context_impl.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 CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_
 #define CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/atomic_sequence_num.h"
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #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 {
 class FilePath;
 class NullableString16;
 class Time;
 }
 
 namespace storage {
 class SpecialStoragePolicy;
 }
 
 namespace content {
 
 class DOMStorageArea;
+class DOMStorageNamespace;
 class DOMStorageSession;
 class DOMStorageTaskRunner;
 class SessionStorageDatabase;
 struct LocalStorageUsageInfo;
 struct SessionStorageUsageInfo;
 
 // The Context is the root of an object containment hierachy for
 // Namespaces and Areas related to the owning profile.
 // One instance is allocated in the main process for each profile,
 // instance methods should be called serially in the background as
@@ skipping 27 matching lines @@
         const base::NullableString16& old_value,
         const GURL& page_url) = 0;
     virtual void OnDOMStorageItemRemoved(
         const DOMStorageArea* area,
         const base::string16& key,
         const base::string16& old_value,
         const GURL& page_url) = 0;
     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() {}
   };
 
   // |localstorage_directory| and |sessionstorage_directory| may be empty
   // for incognito browser contexts.
   DOMStorageContextImpl(const base::FilePath& localstorage_directory,
                         const base::FilePath& sessionstorage_directory,
                         storage::SpecialStoragePolicy* special_storage_policy,
@@ skipping 31 matching lines @@
   // Called when the owning BrowserContext is ending.
   // Schedules the commit of any unsaved changes and will delete
   // and keep data on disk per the content settings and special storage
   // policies. Contained areas and namespaces will stop functioning after
   // this method has been called.
   void Shutdown();
 
   // Methods to add, remove, and notify EventObservers.
   void AddEventObserver(EventObserver* observer);
   void RemoveEventObserver(EventObserver* observer);
-
   void NotifyItemSet(
       const DOMStorageArea* area,
       const base::string16& key,
       const base::string16& new_value,
       const base::NullableString16& old_value,
       const GURL& page_url);
   void NotifyItemRemoved(
       const DOMStorageArea* area,
       const base::string16& key,
       const base::string16& old_value,
       const GURL& page_url);
   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() {
     return session_id_sequence_.GetNext();
   }
 
   std::string AllocatePersistentSessionId();
 
   // Must be called on the background thread.
   void CreateSessionNamespace(int64 namespace_id,
                               const std::string& persistent_namespace_id);
   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.
   void SetSaveSessionStorageOnDisk();
 
   // Deletes all namespaces which don't have an associated DOMStorageNamespace
   // alive. This function is used for deleting possible leftover data after an
   // 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);
   friend class base::RefCountedThreadSafe<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(
       const std::set<std::string>& namespace_ids_in_use,
       const std::set<std::string>& protected_persistent_session_ids);
   void DeleteNextUnusedNamespace();
   void DeleteNextUnusedNamespaceInCommitSequence();
 
   // Collection of namespaces keyed by id.
   StorageNamespaceMap namespaces_;
@@ skipping 30 matching lines @@
   std::set<std::string> protected_persistent_session_ids_;
 
   // Mapping between persistent namespace IDs and namespace IDs for
   // sessionStorage.
   std::map<std::string, int64> persistent_namespace_id_to_namespace_id_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_