Remove navigation from TestRenderViewHost

chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

Index: chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index 7ff86627bced5dcb649d94e5d4d01417aa7d768a..00de2c2a62ecbdce2de559e30e1f361beb267716 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -44,7 +44,7 @@ using ::testing::SaveArg;
 using ::testing::SetArgumentPointee;
 using ::testing::StrictMock;
 using content::BrowserThread;
-using content::RenderViewHostTester;
+using content::RenderFrameHostTester;
 using content::ResourceType;
 using content::WebContents;
 
@@ -946,7 +946,8 @@ TEST_F(ClientSideDetectionHostTest,
 TEST_F(ClientSideDetectionHostTest, TestPreClassificationCheckXHTML) {
   // Check that XHTML is supported, in addition to the default HTML type.
   GURL url("http://host.com/xhtml");
-  rvh_tester()->SetContentsMimeType("application/xhtml+xml");
+  RenderFrameHostTester::For(main_rfh())->
+      SetContentsMimeType("application/xhtml+xml");
   ExpectPreClassificationChecks(url, &kFalse, &kFalse, &kFalse, &kFalse,
                                 &kFalse, &kFalse, &kFalse, &kFalse);
   NavigateAndCommit(url);
@@ -985,7 +986,8 @@ TEST_F(ClientSideDetectionHostTest, TestPreClassificationCheckMimeType) {
   // same domain as the previous URL, otherwise it will create a new
   // RenderViewHost that won't have the mime type set.
   GURL url("http://host2.com/image.jpg");
-  rvh_tester()->SetContentsMimeType("image/jpeg");
+  RenderFrameHostTester::For(web_contents()->GetMainFrame())->

[Charlie Reis, 2014/10/08 17:41:55]

Why are some of these using main_rfh() and others using
web_contents()->GetMainFrame()?

[ncarter (slow), 2014/10/08 22:39:28]

Done. I've switched these over to be web_contents()->GetMainFrame() except when
the surrounding test code already uses main_rfh(), in which case I'm consistent
with that.

I prefer contents()->GetMainFrame() generally.

+      SetContentsMimeType("image/jpeg");
   ExpectPreClassificationChecks(url, &kFalse, &kFalse, &kFalse, &kFalse,
                                 &kFalse, &kFalse, &kFalse, &kFalse);
   NavigateAndCommit(url);