DomStorage house cleaning

content/test/render_view_fake_resources_test.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/test/render_view_fake_resources_test.h"
 
 #include <string.h>
 
 #include "base/process.h"
 #include "base/shared_memory.h"
 #include "base/time.h"
-#include "content/common/dom_storage_common.h"
 #include "content/common/resource_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/resource_response.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/test/mock_render_process.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "webkit/dom_storage/dom_storage_types.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/webkit_glue.h"
 
 const int32 RenderViewFakeResourcesTest::kViewId = 5;
 
 RenderViewFakeResourcesTest::RenderViewFakeResourcesTest() {}
 RenderViewFakeResourcesTest::~RenderViewFakeResourcesTest() {}
 
 bool RenderViewFakeResourcesTest::OnMessageReceived(
     const IPC::Message& message) {
@@ skipping 27 matching lines @@
   mock_process_.reset(new MockRenderProcess);
   render_thread_ = new RenderThreadImpl(kThreadName);
 
   // Tell the renderer to create a view, then wait until it's ready.
   // We can't call View::Create() directly here or else we won't get
   // RenderProcess's lazy initialization of WebKit.
   view_ = NULL;
   ViewMsg_New_Params params;
   params.parent_window = 0;
   params.view_id = kViewId;
-  params.session_storage_namespace_id = kInvalidSessionStorageNamespaceId;
+  params.session_storage_namespace_id =
+      dom_storage::kInvalidSessionStorageNamespaceId;
   ASSERT_TRUE(channel_->Send(new ViewMsg_New(params)));
   message_loop_.Run();
 }
 
 void RenderViewFakeResourcesTest::TearDown() {
   // Try very hard to collect garbage before shutting down.
   GetMainFrame()->collectGarbage();
   GetMainFrame()->collectGarbage();
 
   ASSERT_TRUE(channel_->Send(new ViewMsg_Close(kViewId)));
@@ skipping 104 matching lines @@
   params.current_history_list_length = (impl->historyBackListCount() +
                                         impl->historyForwardListCount() + 1);
   params.url = GURL(history_item.urlString());
   params.transition = content::PAGE_TRANSITION_FORWARD_BACK;
   params.state = webkit_glue::HistoryItemToString(history_item);
   params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
   params.request_time = base::Time::Now();
   channel_->Send(new ViewMsg_Navigate(impl->routing_id(), params));
   message_loop_.Run();
 }