Undo band-aid which was ignoring wrong SessionStorage association.

webkit/browser/dom_storage/dom_storage_host.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 "webkit/browser/dom_storage/dom_storage_host.h"
 
 #include "url/gurl.h"
 #include "webkit/browser/dom_storage/dom_storage_area.h"
 #include "webkit/browser/dom_storage/dom_storage_context.h"
 #include "webkit/browser/dom_storage/dom_storage_namespace.h"
@@ skipping 12 matching lines @@
   connections_.clear();  // Clear prior to releasing the context_
 }
 
 bool DomStorageHost::OpenStorageArea(int connection_id, int namespace_id,
                                      const GURL& origin) {
   DCHECK(!GetOpenArea(connection_id));
   if (GetOpenArea(connection_id))
     return false;  // Indicates the renderer gave us very bad data.
   NamespaceAndArea references;
   references.namespace_ = context_->GetStorageNamespace(namespace_id);
-  if (!references.namespace_.get()) {
-    // TODO(michaeln): Fix crbug/134003 and return false here.
-    // Until then return true to avoid crashing the renderer for
-    // sending a bad message.
-    return true;
-  }
+  if (!references.namespace_.get())
+    return false;
   references.area_ = references.namespace_->OpenStorageArea(origin);
   DCHECK(references.area_.get());
   connections_[connection_id] = references;
   return true;
 }
 
 void DomStorageHost::CloseStorageArea(int connection_id) {
   AreaMap::iterator found = connections_.find(connection_id);
   if (found == connections_.end())
     return;
   found->second.namespace_->CloseStorageArea(found->second.area_.get());
   connections_.erase(found);
 }
 
 bool DomStorageHost::ExtractAreaValues(
     int connection_id, ValuesMap* map) {
   map->clear();
   DomStorageArea* area = GetOpenArea(connection_id);
-  if (!area) {
-    // TODO(michaeln): Fix crbug/134003 and return false here.
-    // Until then return true to avoid crashing the renderer
-    // for sending a bad message.
-    return true;
-  }
+  if (!area)
+    return false;
   if (!area->IsLoadedInMemory()) {
     DomStorageNamespace* ns = GetNamespace(connection_id);
     DCHECK(ns);
     if (ns->CountInMemoryAreas() > kMaxInMemoryAreas) {
       ns->PurgeMemory(DomStorageNamespace::PURGE_UNOPENED);
       if (ns->CountInMemoryAreas() > kMaxInMemoryAreas)
         ns->PurgeMemory(DomStorageNamespace::PURGE_AGGRESSIVE);
     }
   }
   area->ExtractValues(map);
@@ skipping 21 matching lines @@
   if (!area)
     return base::NullableString16();
   return area->GetItem(key);
 }
 
 bool DomStorageHost::SetAreaItem(
     int connection_id, const base::string16& key,
     const base::string16& value, const GURL& page_url,
     base::NullableString16* old_value) {
   DomStorageArea* area = GetOpenArea(connection_id);
-  if (!area) {
-    // TODO(michaeln): Fix crbug/134003 and return false here.
-    // Until then return true to allow the renderer to operate
-    // to a limited degree out of its cache.
-    return true;
-  }
+  if (!area)
+    return false;
   if (!area->SetItem(key, value, old_value))
     return false;
   if (old_value->is_null() || old_value->string() != value)
     context_->NotifyItemSet(area, key, value, *old_value, page_url);
   return true;
 }
 
 bool DomStorageHost::RemoveAreaItem(
     int connection_id, const base::string16& key, const GURL& page_url,
     base::string16* old_value) {
@@ skipping 41 matching lines @@
     return NULL;
   return found->second.namespace_.get();
 }
 
 // NamespaceAndArea
 
 DomStorageHost::NamespaceAndArea::NamespaceAndArea() {}
 DomStorageHost::NamespaceAndArea::~NamespaceAndArea() {}
 
 }  // namespace dom_storage