DomStorage house cleaning

content/renderer/renderer_webstoragearea_impl.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/renderer_webstoragearea_impl.h"
 
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "content/common/dom_storage_messages.h"
 #include "content/renderer/render_thread_impl.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
+#include "webkit/dom_storage/dom_storage_types.h"
 
-using WebKit::WebStorageNamespace;
 using WebKit::WebString;
 using WebKit::WebURL;
 
 RendererWebStorageAreaImpl::RendererWebStorageAreaImpl(
     int64 namespace_id, const WebString& origin) {
   RenderThreadImpl::current()->Send(
       new DOMStorageHostMsg_OpenStorageArea(namespace_id, origin,
                                             &storage_area_id_));
 }
 
@@ skipping 33 matching lines @@
 WebString RendererWebStorageAreaImpl::getItem(const WebString& key) {
   NullableString16 value;
   RenderThreadImpl::current()->Send(
       new DOMStorageHostMsg_GetItem(storage_area_id_, key, &value));
   return value;
 }
 
 void RendererWebStorageAreaImpl::setItem(
     const WebString& key, const WebString& value, const WebURL& url,
     WebStorageArea::Result& result, WebString& old_value_webkit) {
-  const size_t kMaxKeyValueLength = WebStorageNamespace::m_localStorageQuota;
-  if (key.length() + value.length() > kMaxKeyValueLength) {
+  if (key.length() + value.length() > dom_storage::kPerAreaQuota) {
     result = ResultBlockedByQuota;
     return;
   }
   NullableString16 old_value;
   RenderThreadImpl::current()->Send(new DOMStorageHostMsg_SetItem(
       storage_area_id_, key, value, url, &result, &old_value));
   old_value_webkit = old_value;
 }
 
 void RendererWebStorageAreaImpl::removeItem(
     const WebString& key, const WebURL& url, WebString& old_value_webkit) {
   NullableString16 old_value;
   RenderThreadImpl::current()->Send(
       new DOMStorageHostMsg_RemoveItem(storage_area_id_, key, url, &old_value));
   old_value_webkit = old_value;
 }
 
 void RendererWebStorageAreaImpl::clear(
     const WebURL& url, bool& cleared_something) {
   RenderThreadImpl::current()->Send(
       new DOMStorageHostMsg_Clear(storage_area_id_, url, &cleared_something));
 }