DomStorage house cleaning

content/browser/renderer_host/test_render_view_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 "content/browser/renderer_host/test_backing_store.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/tab_contents/navigation_controller_impl.h"
 #include "content/browser/tab_contents/test_web_contents.h"
-#include "content/common/dom_storage_common.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/common/content_client.h"
 #include "ui/gfx/rect.h"
+#include "webkit/dom_storage/dom_storage_types.h"
 #include "webkit/forms/password_form.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 
 using webkit::forms::PasswordForm;
 
 namespace content {
 
 void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,
                         int page_id,
@@ skipping 170 matching lines @@
 
 void TestRenderWidgetHostView::UnlockMouse() {
 }
 
 TestRenderViewHost::TestRenderViewHost(SiteInstance* instance,
                                        RenderViewHostDelegate* delegate,
                                        int routing_id)
     : RenderViewHostImpl(instance,
                          delegate,
                          routing_id,
-                         kInvalidSessionStorageNamespaceId),
+                         dom_storage::kInvalidSessionStorageNamespaceId),
       render_view_created_(false),
       delete_counter_(NULL),
       simulate_fetch_via_proxy_(false),
       contents_mime_type_("text/html") {
   // For normal RenderViewHosts, this is freed when |Shutdown()| is
   // called.  For TestRenderViewHost, the view is explicitly
   // deleted in the destructor below, because
   // TestRenderWidgetHostView::Destroy() doesn't |delete this|.
   SetView(new TestRenderWidgetHostView(this));
 }
@@ skipping 95 matching lines @@
 
 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() {
   return static_cast<TestRenderViewHost*>(active_rvh());
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content