Rename RenderView to RenderViewImpl. Update Chrome's DEPS so that it can't include the RenderView...

content/test/render_view_fake_resources_test.cc

 // Copyright (c) 2011 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/resource_response.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/mock_render_process.h"
 #include "content/renderer/render_thread_impl.h"
-#include "content/renderer/render_view.h"
+#include "content/renderer/render_view_impl.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/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/glue_serialize.h"
@@ skipping 12 matching lines @@
     const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(RenderViewFakeResourcesTest, message)
     IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewReady, OnRenderViewReady)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidStopLoading, OnDidStopLoading)
     IPC_MESSAGE_HANDLER(ResourceHostMsg_RequestResource, OnRequestResource)
   IPC_END_MESSAGE_MAP()
   return true;
 }
 
 bool RenderViewFakeResourcesTest::Visit(content::RenderView* render_view) {
-  view_ = static_cast<RenderView*>(render_view);
+  view_ = render_view;
   return false;
 }
 
 void RenderViewFakeResourcesTest::SetUp() {
   // Set up the renderer.  This code is largely adapted from
   // render_view_test.cc and renderer_main.cc.  Note that we use a
   // MockRenderProcess (because we don't need to use IPC for painting),
   // but we use a real RenderThread so that we can use the ResourceDispatcher
   // to fetch network resources.  These are then served canned content
   // in OnRequestResource().
@@ skipping 25 matching lines @@
 
 void RenderViewFakeResourcesTest::TearDown() {
   // Try very hard to collect garbage before shutting down.
   GetMainFrame()->collectGarbage();
   GetMainFrame()->collectGarbage();
 
   ASSERT_TRUE(channel_->Send(new ViewMsg_Close(kViewId)));
   do {
     message_loop_.RunAllPending();
     view_ = NULL;
-    RenderView::ForEach(this);
+    content::RenderView::ForEach(this);
   } while (view_);
 
   mock_process_.reset();
 }
 
 content::RenderView* RenderViewFakeResourcesTest::view() {
   return view_;
 }
 
 WebKit::WebFrame* RenderViewFakeResourcesTest::GetMainFrame() {
-  return view_->webview()->mainFrame();
+  return view_->GetWebView()->mainFrame();
 }
 
 void RenderViewFakeResourcesTest::LoadURL(const std::string& url) {
   GURL g_url(url);
   GetMainFrame()->loadRequest(WebKit::WebURLRequest(g_url));
   message_loop_.Run();
 }
 
 void RenderViewFakeResourcesTest::LoadURLWithPost(const std::string& url) {
   GURL g_url(url);
@@ skipping 55 matching lines @@
       message.routing_id(),
       request_id,
       net::URLRequestStatus(),
       std::string(),
       base::Time())));
 }
 
 void RenderViewFakeResourcesTest::OnRenderViewReady() {
   // Grab a pointer to the new view using RenderViewVisitor.
   ASSERT_TRUE(!view_);
-  RenderView::ForEach(this);
+  content::RenderView::ForEach(this);
   ASSERT_TRUE(view_);
   message_loop_.Quit();
 }
 
 void RenderViewFakeResourcesTest::GoToOffset(
     int offset,
     const WebKit::WebHistoryItem& history_item) {
+  RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   ViewMsg_Navigate_Params params;
-  params.page_id = view_->GetPageId() + offset;
+  params.page_id = impl->GetPageId() + offset;
   params.pending_history_list_offset =
-      view_->history_list_offset() + offset;
-  params.current_history_list_offset = view_->history_list_offset();
-  params.current_history_list_length = (view_->historyBackListCount() +
-                                        view_->historyForwardListCount() + 1);
+      impl->history_list_offset() + offset;
+  params.current_history_list_offset = impl->history_list_offset();
+  params.current_history_list_length = (impl->historyBackListCount() +
+                                        impl->historyForwardListCount() + 1);
   params.url = GURL(history_item.urlString());
   params.transition = PageTransition::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(view_->routing_id(), params));
+  channel_->Send(new ViewMsg_Navigate(impl->routing_id(), params));
   message_loop_.Run();
 }