Convert ClientSideDetectionHost to use the new navigation callbacks.

chrome/browser/safe_browsing/client_side_detection_host.h

 // 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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_
 #define CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 28 matching lines @@
 
   // From content::WebContentsObserver.
   bool OnMessageReceived(const IPC::Message& message,
                          content::RenderFrameHost* render_frame_host) override;
   void DidGetResourceResponseStart(
       const content::ResourceRequestDetails& details) override;
 
   // From content::WebContentsObserver.  If we navigate away we cancel all
   // pending callbacks that could show an interstitial, and check to see whether
   // we should classify the new URL.
-  void DidNavigateMainFrame(
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) override;
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override;
 
   // Called when the SafeBrowsingService found a hit with one of the
   // SafeBrowsing lists.  This method is called on the UI thread.
   void OnSafeBrowsingHit(
       const security_interstitials::UnsafeResource& resource) override;
 
   virtual scoped_refptr<SafeBrowsingDatabaseManager> database_manager();
 
+  static void IgnoreMimeTypeCheckForTesting(bool ignore);

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

Why is this necessary now? If the new stuff means test code no longer gets a
default of text/html, I'd rather have the tests explicitly set that than add
test-only conditions just for this.

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

Also the comment for SetContentsMimeType might need to be updated?
https://cs.chromium.org/chromium/src/content/public/test/test_renderer_host.h...

[jam, 2017/02/07 20:39:40]

Correct, that's the reason.

The only place that cared about this was the 5 or so tests in this unittest
file. That's why I changed only this test, instead of adding test-only methods
to NavigationHandle and RenderFrameHost to enable setting this.

+
  protected:
   explicit ClientSideDetectionHost(content::WebContents* tab);
 
   // From content::WebContentsObserver.
   void WebContentsDestroyed() override;
 
   // Used for testing.
   void set_safe_browsing_managers(
       SafeBrowsingUIManager* ui_manager,
       SafeBrowsingDatabaseManager* database_manager);
@@ skipping 95 matching lines @@
   std::unique_ptr<security_interstitials::UnsafeResource> unsafe_resource_;
 
   base::WeakPtrFactory<ClientSideDetectionHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSideDetectionHost);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_