Another stab at the Chromium side of storage events. The WebKit side can be ...

chrome/browser/in_process_webkit/storage_namespace.cc

 // Copyright (c) 2009 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 "chrome/browser/in_process_webkit/storage_namespace.h"
 
 #include "base/file_path.h"
 #include "chrome/browser/in_process_webkit/dom_storage_context.h"
 #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h"
 #include "chrome/browser/in_process_webkit/storage_area.h"
@@ skipping 24 matching lines @@
   int64 id = dom_storage_context->AllocateStorageNamespaceId();
   DCHECK(!dom_storage_context->GetStorageNamespace(id));
   WebStorageNamespace* web_storage_namespace =
       WebStorageNamespace::createSessionStorageNamespace();
   return new StorageNamespace(dom_storage_context, web_storage_namespace, id,
                               DOM_STORAGE_SESSION);
 }
 
 StorageNamespace::StorageNamespace(DOMStorageContext* dom_storage_context,
                                    WebStorageNamespace* storage_namespace,
-                                   int64 id, DOMStorageType storage_type)
+                                   int64 id, DOMStorageType dom_storage_type)
     : dom_storage_context_(dom_storage_context),
       storage_namespace_(storage_namespace),
       id_(id),
-      storage_type_(storage_type) {
+      dom_storage_type_(dom_storage_type) {
   DCHECK(dom_storage_context_);
   DCHECK(storage_namespace_);
   dom_storage_context_->RegisterStorageNamespace(this);
 }
 
 StorageNamespace::~StorageNamespace() {
   dom_storage_context_->UnregisterStorageNamespace(this);
 
   OriginToStorageAreaMap::iterator iter = origin_to_storage_area_.begin();
   OriginToStorageAreaMap::iterator end = origin_to_storage_area_.end();
@@ skipping 15 matching lines @@
   DCHECK(!dom_storage_context_->GetStorageArea(id));
   WebStorageArea* web_storage_area =
       storage_namespace_->createStorageArea(origin);
   StorageArea* storage_area = new StorageArea(origin, web_storage_area, id);
   origin_to_storage_area_[origin] = storage_area;
   dom_storage_context_->RegisterStorageArea(storage_area);
   return storage_area;
 }
 
 StorageNamespace* StorageNamespace::Copy() {
-  DCHECK(storage_type_ == DOM_STORAGE_SESSION);
+  DCHECK(dom_storage_type_ == DOM_STORAGE_SESSION);
   int64 id = dom_storage_context_->AllocateStorageNamespaceId();
   DCHECK(!dom_storage_context_->GetStorageNamespace(id));
   WebStorageNamespace* new_storage_namespace = storage_namespace_->copy();
   return new StorageNamespace(dom_storage_context_, new_storage_namespace, id,
-                              storage_type_);
+                              dom_storage_type_);
 }
 
 void StorageNamespace::Close() {
   storage_namespace_->close();
 }