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

content/renderer/dom_storage/dom_storage_dispatcher.cc

 // 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.
 
 #include "content/renderer/dom_storage/dom_storage_dispatcher.h"
 
 #include <list>
 #include <map>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 86 matching lines @@
 class DomStorageDispatcher::ProxyImpl : public DOMStorageProxy {
  public:
   explicit ProxyImpl(RenderThreadImpl* sender);
 
   // Methods for use by DomStorageDispatcher directly.
   DOMStorageCachedArea* OpenCachedArea(
       int64 namespace_id, const GURL& origin);
   void CloseCachedArea(DOMStorageCachedArea* area);
   DOMStorageCachedArea* LookupCachedArea(
       int64 namespace_id, const GURL& origin);
-  void ResetAllCachedAreas(int64 namespace_id);
   void CompleteOnePendingCallback(bool success);
   void Shutdown();
 
   // DOMStorageProxy interface for use by DOMStorageCachedArea.
   void LoadArea(int connection_id,
                 DOMStorageValuesMap* values,
-                bool* send_log_get_messages,
                 const CompletionCallback& callback) override;
   void SetItem(int connection_id,
                const base::string16& key,
                const base::string16& value,
                const GURL& page_url,
                const CompletionCallback& callback) override;
-  void LogGetItem(int connection_id,
-                  const base::string16& key,
-                  const base::NullableString16& value) override;
   void RemoveItem(int connection_id,
                   const base::string16& key,
                   const GURL& page_url,
                   const CompletionCallback& callback) override;
   void ClearArea(int connection_id,
                  const GURL& page_url,
                  const CompletionCallback& callback) override;
 
  private:
   // Struct to hold references to our contained areas and
   // to keep track of how many tabs have a given area open.
   struct CachedAreaHolder {
     scoped_refptr<DOMStorageCachedArea> area_;
     int open_count_;
-    int64 namespace_id_;
     CachedAreaHolder() : open_count_(0) {}
-    CachedAreaHolder(DOMStorageCachedArea* area, int count,
-                     int64 namespace_id)
-        : area_(area), open_count_(count), namespace_id_(namespace_id) {}
+    CachedAreaHolder(DOMStorageCachedArea* area, int count)
+        : area_(area), open_count_(count) {}
   };
   typedef std::map<std::string, CachedAreaHolder> CachedAreaMap;
   typedef std::list<CompletionCallback> CallbackList;
 
   ~ProxyImpl() override {}
 
   // Sudden termination is disabled when there are callbacks pending
   // to more reliably commit changes during shutdown.
   void PushPendingCallback(const CompletionCallback& callback) {
     if (pending_callbacks_.empty())
@@ skipping 34 matching lines @@
 
 DOMStorageCachedArea* DomStorageDispatcher::ProxyImpl::OpenCachedArea(
     int64 namespace_id, const GURL& origin) {
   std::string key = GetCachedAreaKey(namespace_id, origin);
   if (CachedAreaHolder* holder = GetAreaHolder(key)) {
     ++(holder->open_count_);
     return holder->area_.get();
   }
   scoped_refptr<DOMStorageCachedArea> area =
       new DOMStorageCachedArea(namespace_id, origin, this);
-  cached_areas_[key] = CachedAreaHolder(area.get(), 1, namespace_id);
+  cached_areas_[key] = CachedAreaHolder(area.get(), 1);
   return area.get();
 }
 
 void DomStorageDispatcher::ProxyImpl::CloseCachedArea(
     DOMStorageCachedArea* area) {
   std::string key = GetCachedAreaKey(area->namespace_id(), area->origin());
   CachedAreaHolder* holder = GetAreaHolder(key);
   DCHECK(holder);
   DCHECK_EQ(holder->area_.get(), area);
   DCHECK_GT(holder->open_count_, 0);
   if (--(holder->open_count_) == 0) {
     cached_areas_.erase(key);
   }
 }
 
 DOMStorageCachedArea* DomStorageDispatcher::ProxyImpl::LookupCachedArea(
     int64 namespace_id, const GURL& origin) {
   std::string key = GetCachedAreaKey(namespace_id, origin);
   CachedAreaHolder* holder = GetAreaHolder(key);
   if (!holder)
     return NULL;
   return holder->area_.get();
 }
 
-void DomStorageDispatcher::ProxyImpl::ResetAllCachedAreas(int64 namespace_id) {
-  for (CachedAreaMap::iterator it = cached_areas_.begin();
-       it != cached_areas_.end();
-       ++it) {
-    if (it->second.namespace_id_ == namespace_id)
-      it->second.area_->Reset();
-  }
-}
-
 void DomStorageDispatcher::ProxyImpl::CompleteOnePendingCallback(bool success) {
   PopPendingCallback().Run(success);
 }
 
 void DomStorageDispatcher::ProxyImpl::Shutdown() {
   throttling_filter_->Shutdown();
   sender_->RemoveFilter(throttling_filter_.get());
   sender_ = NULL;
   cached_areas_.clear();
   pending_callbacks_.clear();
 }
 
 void DomStorageDispatcher::ProxyImpl::LoadArea(
-    int connection_id, DOMStorageValuesMap* values, bool* send_log_get_messages,
+    int connection_id, DOMStorageValuesMap* values,
     const CompletionCallback& callback) {
   PushPendingCallback(callback);
   throttling_filter_->SendThrottled(new DOMStorageHostMsg_LoadStorageArea(
-      connection_id, values, send_log_get_messages));
+      connection_id, values));
 }
 
 void DomStorageDispatcher::ProxyImpl::SetItem(
     int connection_id, const base::string16& key,
     const base::string16& value, const GURL& page_url,
     const CompletionCallback& callback) {
   PushPendingCallback(callback);
   throttling_filter_->SendThrottled(new DOMStorageHostMsg_SetItem(
       connection_id, key, value, page_url));
 }
 
-void DomStorageDispatcher::ProxyImpl::LogGetItem(
-    int connection_id, const base::string16& key,
-    const base::NullableString16& value) {
-  sender_->Send(new DOMStorageHostMsg_LogGetItem(connection_id, key, value));
-}
-
 void DomStorageDispatcher::ProxyImpl::RemoveItem(
     int connection_id, const base::string16& key,  const GURL& page_url,
     const CompletionCallback& callback) {
   PushPendingCallback(callback);
   throttling_filter_->SendThrottled(new DOMStorageHostMsg_RemoveItem(
       connection_id, key, page_url));
 }
 
 void DomStorageDispatcher::ProxyImpl::ClearArea(int connection_id,
                       const GURL& page_url,
@@ skipping 27 matching lines @@
       new DOMStorageHostMsg_CloseStorageArea(connection_id));
   proxy_->CloseCachedArea(area);
 }
 
 bool DomStorageDispatcher::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(DomStorageDispatcher, msg)
     IPC_MESSAGE_HANDLER(DOMStorageMsg_Event, OnStorageEvent)
     IPC_MESSAGE_HANDLER(DOMStorageMsg_AsyncOperationComplete,
                         OnAsyncOperationComplete)
-    IPC_MESSAGE_HANDLER(DOMStorageMsg_ResetCachedValues,
-                        OnResetCachedValues)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void DomStorageDispatcher::OnStorageEvent(
     const DOMStorageMsg_Event_Params& params) {
   RenderThreadImpl::current()->EnsureWebKitInitialized();
 
   bool originated_in_process = params.connection_id != 0;
@@ skipping 29 matching lines @@
         session_namespace_for_event_dispatch,
         originating_area,
         originated_in_process);
   }
 }
 
 void DomStorageDispatcher::OnAsyncOperationComplete(bool success) {
   proxy_->CompleteOnePendingCallback(success);
 }
 
-void DomStorageDispatcher::OnResetCachedValues(int64 namespace_id) {
-  proxy_->ResetAllCachedAreas(namespace_id);
-}
-
 }  // namespace content