Remove navigation from TestRenderViewHost

chrome/browser/safe_browsing/client_side_detection_host_unittest.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 "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 26 matching lines @@
 using ::testing::IsNull;
 using ::testing::Mock;
 using ::testing::NiceMock;
 using ::testing::NotNull;
 using ::testing::Pointee;
 using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::SetArgumentPointee;
 using ::testing::StrictMock;
 using content::BrowserThread;
-using content::RenderViewHostTester;
+using content::RenderFrameHostTester;
 using content::ResourceType;
 using content::WebContents;
 
 namespace {
 
 const bool kFalse = false;
 const bool kTrue = true;
 
 }  // namespace
 
@@ skipping 881 matching lines @@
   NavigateAndCommit(inpage);
   WaitAndCheckPreClassificationChecks();
 
   ExpectStartPhishingDetection(NULL);
   ExpectShouldClassifyForMalwareResult(true);
 }
 
 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);
   WaitAndCheckPreClassificationChecks();
 
   ExpectStartPhishingDetection(&url);
   ExpectShouldClassifyForMalwareResult(true);
 }
 
 TEST_F(ClientSideDetectionHostTest, TestPreClassificationCheckTwoNavigations) {
@@ skipping 18 matching lines @@
 }
 
 TEST_F(ClientSideDetectionHostTest, TestPreClassificationCheckMimeType) {
   // If the mime type is not one that we support, no IPC should be triggered
   // but all pre-classification checks should run because we might classify
   // other mime types for malware.
   // Note: for this test to work correctly, the new URL must be on the
   // 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);
   WaitAndCheckPreClassificationChecks();
 
   ExpectStartPhishingDetection(NULL);
   ExpectShouldClassifyForMalwareResult(true);
 }
 
 TEST_F(ClientSideDetectionHostTest,
@@ skipping 142 matching lines @@
   EXPECT_EQ(url, resource.url);
   EXPECT_EQ(url, resource.original_url);
 
   ExpectStartPhishingDetection(NULL);
 
   // Showing a phishing warning will invalidate all the weak pointers which
   // means we will not extract malware features.
   ExpectShouldClassifyForMalwareResult(false);
 }
 }  // namespace safe_browsing