Convert ClientSideDetectionHost to use the new navigation callbacks.

chrome/browser/safe_browsing/client_side_detection_host.h

Index: chrome/browser/safe_browsing/client_side_detection_host.h
diff --git a/chrome/browser/safe_browsing/client_side_detection_host.h b/chrome/browser/safe_browsing/client_side_detection_host.h
index f107302fbbcae72944fcfe7682d9c9525050b7e5..2ad83256c446cf04ca85f11904e0a31a7a0e6604 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host.h
+++ b/chrome/browser/safe_browsing/client_side_detection_host.h
@@ -46,9 +46,8 @@ class ClientSideDetectionHost : public content::WebContentsObserver,
   // 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.
@@ -57,6 +56,8 @@ class ClientSideDetectionHost : public content::WebContentsObserver,
 
   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);