DomStorage house cleaning

content/renderer/render_view_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/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 138 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/javascript_message_type.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "v8/include/v8.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
+#include "webkit/dom_storage/dom_storage_types.h"
 #include "webkit/forms/form_data.h"
 #include "webkit/forms/form_field.h"
 #include "webkit/forms/password_form_dom_manager.h"
 #include "webkit/glue/alt_error_page_resource_fetcher.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webkit_constants.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/weburlloader_impl.h"
@@ skipping 1380 matching lines @@
     active_url = GURL(webview()->mainFrame()->document().url());
   RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create(
       routing_id_, plugin, active_url);
   widget->show(WebKit::WebNavigationPolicyIgnore);
   return widget;
 }
 
 WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace(
     unsigned quota) {
 #ifdef ENABLE_NEW_DOM_STORAGE_BACKEND
-  CHECK(session_storage_namespace_id_ != kInvalidSessionStorageNamespaceId);
-  return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION,
-                                             session_storage_namespace_id_);
+  CHECK(session_storage_namespace_id_ !=
+        dom_storage::kInvalidSessionStorageNamespaceId);
+  return new RendererWebStorageNamespaceImpl(session_storage_namespace_id_);
 #else
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
     return WebStorageNamespace::createSessionStorageNamespace(quota);
-  CHECK(session_storage_namespace_id_ != kInvalidSessionStorageNamespaceId);
-  return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION,
-                                             session_storage_namespace_id_);
+  CHECK(session_storage_namespace_id_ !=
+        dom_storage::kInvalidSessionStorageNamespaceId);
+  return new RendererWebStorageNamespaceImpl(session_storage_namespace_id_);
 #endif
 }
 
 WebGraphicsContext3D* RenderViewImpl::createGraphicsContext3D(
     const WebGraphicsContext3D::Attributes& attributes) {
   if (!webview())
     return NULL;
   // The WebGraphicsContext3DInProcessImpl code path is used for
   // layout tests (though not through this code) as well as for
   // debugging and bringing up new ports.
@@ skipping 3662 matching lines @@
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit() {
   DCHECK(!java_bridge_dispatcher_.get());
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
 #endif
 }