Convert ClientSideDetectionHost to use the new navigation callbacks.

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 "chrome/browser/safe_browsing/client_side_detection_host.h"
 
 #include <memory>
 #include <tuple>
 #include <utility>
 
@@ skipping 204 matching lines @@
     database_manager_ = new StrictMock<MockSafeBrowsingDatabaseManager>();
     ui_manager_ = new StrictMock<MockSafeBrowsingUIManager>(
         SafeBrowsingService::CreateSafeBrowsingService());
     csd_host_.reset(ClientSideDetectionHost::Create(web_contents()));
     csd_host_->set_client_side_detection_service(csd_service_.get());
     csd_host_->set_safe_browsing_managers(ui_manager_.get(),
                                           database_manager_.get());
     // We need to create this here since we don't call DidStopLanding in
     // this test.
     csd_host_->browse_info_.reset(new BrowseInfo);
+    ClientSideDetectionHost::IgnoreMimeTypeCheckForTesting(true);
   }
 
   void TearDown() override {
     // Delete the host object on the UI thread and release the
     // SafeBrowsingService.
     BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE,
                               csd_host_.release());
     database_manager_ = NULL;
     ui_manager_ = NULL;
     base::RunLoop().RunUntilIdle();
     ChromeRenderViewHostTestHarness::TearDown();
+    ClientSideDetectionHost::IgnoreMimeTypeCheckForTesting(false);
   }
 
   content::BrowserContext* CreateBrowserContext() override {
     // Set custom profile object so that we can mock calls to IsOffTheRecord.
     // This needs to happen before we call the parent SetUp() function.  We use
     // a nice mock because other parts of the code are calling IsOffTheRecord.
     mock_profile_ = new NiceMock<MockTestingProfile>();
     return mock_profile_;
   }
 
@@ skipping 742 matching lines @@
   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");
   RenderFrameHostTester::For(web_contents()->GetMainFrame())->
       SetContentsMimeType("application/xhtml+xml");

[mattm, 2017/02/07 20:35:47]

(also this one is currently getting ignored, but irrelevant if you do my other
comment)

   ExpectPreClassificationChecks(url, &kFalse, &kFalse, &kFalse, &kFalse,
                                 &kFalse, &kFalse, &kFalse, &kFalse);
   NavigateAndCommit(url);
   WaitAndCheckPreClassificationChecks();
 
   ExpectStartPhishingDetection(&url);
   ExpectShouldClassifyForMalwareResult(true);
 }
 
 TEST_F(ClientSideDetectionHostTest, TestPreClassificationCheckTwoNavigations) {
@@ skipping 17 matching lines @@
   ExpectShouldClassifyForMalwareResult(true);
 }
 
 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
   // RenderFrameHost that won't have the mime type set.
+  ClientSideDetectionHost::IgnoreMimeTypeCheckForTesting(false);
   GURL url("http://host2.com/image.jpg");
   RenderFrameHostTester::For(web_contents()->GetMainFrame())->
       SetContentsMimeType("image/jpeg");
   ExpectPreClassificationChecks(url, &kFalse, &kFalse, &kFalse, &kFalse,
                                 &kFalse, &kFalse, &kFalse, &kFalse);
   NavigateAndCommit(url);
   WaitAndCheckPreClassificationChecks();
 
   ExpectStartPhishingDetection(NULL);
   ExpectShouldClassifyForMalwareResult(true);
+  ClientSideDetectionHost::IgnoreMimeTypeCheckForTesting(true);
 }
 
 TEST_F(ClientSideDetectionHostTest,
        TestPreClassificationCheckPrivateIpAddress) {
   // If IsPrivateIPAddress returns true, no IPC should be triggered.
   GURL url("http://host3.com/");
   ExpectPreClassificationChecks(url, &kTrue, &kFalse, NULL, NULL, NULL, NULL,
                                 NULL, NULL);
   NavigateAndCommit(url);
   WaitAndCheckPreClassificationChecks();
@@ skipping 135 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