2 files changed, 3 insertions, 6 deletions
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index 79ef96d..2106b4d 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/browser/tab_contents/render_view_host_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
@@ -80,9 +79,8 @@ void BrowserWithTestWindowTest::CommitPendingLoad(
   TestRenderViewHost* old_rvh =
       TestRenderViewHostForTab(controller->GetWebContents());
 
-  TestRenderViewHost* pending_rvh = static_cast<TestRenderViewHost*>(
-      controller->GetWebContents()->GetRenderManagerForTesting()->
-      pending_render_view_host());
+  TestRenderViewHost* pending_rvh = TestRenderViewHost::GetPendingForController(
+      controller);
   if (pending_rvh) {
     // Simulate the ShouldClose_ACK that is received from the current renderer
     // for a cross-site navigation.
diff --git a/chrome/test/perf/rendering/latency_tests.cc b/chrome/test/perf/rendering/latency_tests.cc
index fbd261c..63dba6c 100644
--- a/chrome/test/perf/rendering/latency_tests.cc
+++ b/chrome/test/perf/rendering/latency_tests.cc
@@ -22,7 +22,6 @@
 #include "chrome/test/perf/browser_perf_test.h"
 #include "chrome/test/perf/perf_test.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/render_view_host_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
@@ -541,7 +540,7 @@ void LatencyTest::GetMeanFrameTimeMicros(int* frame_time) const {
 
 void LatencyTest::SendInput() {
   RenderViewHost* rvh = browser()->GetSelectedTabContentsWrapper()->
-      web_contents()->GetRenderManagerForTesting()->current_host();
+      web_contents()->GetRenderViewHost();
   WebKit::WebMouseEvent mouse_event;
   mouse_event.movementX = 1;
   mouse_x_ += mouse_event.movementX;