Enable client side phishing detection on https sites.

(Client side malware detection is already enabled on https).

BUG=730895

Review-Url: https://codereview.chromium.org/2927123004
Cr-Commit-Position: refs/heads/master@{#478810}

chrome/browser/safe_browsing/client_side_detection_host.cc

@@ -110,12 +110,12 @@ class ClientSideDetectionHost::ShouldClassifyUrlRequest
       DontClassifyForMalware(NO_CLASSIFY_PRIVATE_IP);
     }
 
-    // For phishing we only classify HTTP pages.
-    if (!url_.SchemeIs(url::kHttpScheme)) {
+    // For phishing we only classify HTTP or HTTPS pages.
+    if (!url_.SchemeIsHTTPOrHTTPS()) {
       DVLOG(1) << "Skipping phishing classification for URL: " << url_
-               << " because it is not HTTP: "
+               << " because it is not HTTP or HTTPS: "
                << socket_address_.host();
-      DontClassifyForPhishing(NO_CLASSIFY_NOT_HTTP_URL);
+      DontClassifyForPhishing(NO_CLASSIFY_SCHEME_NOT_SUPPORTED);
     }
 
     // Don't run any classifier if the tab is incognito.
@@ -156,17 +156,18 @@ class ClientSideDetectionHost::ShouldClassifyUrlRequest
 
   // Enum used to keep stats about why the pre-classification check failed.
   enum PreClassificationCheckFailures {
-    OBSOLETE_NO_CLASSIFY_PROXY_FETCH,
-    NO_CLASSIFY_PRIVATE_IP,
-    NO_CLASSIFY_OFF_THE_RECORD,
-    NO_CLASSIFY_MATCH_CSD_WHITELIST,
-    NO_CLASSIFY_TOO_MANY_REPORTS,
-    NO_CLASSIFY_UNSUPPORTED_MIME_TYPE,
-    NO_CLASSIFY_NO_DATABASE_MANAGER,
-    NO_CLASSIFY_KILLSWITCH,
-    NO_CLASSIFY_CANCEL,
-    NO_CLASSIFY_RESULT_FROM_CACHE,
-    NO_CLASSIFY_NOT_HTTP_URL,
+    OBSOLETE_NO_CLASSIFY_PROXY_FETCH = 0,
+    NO_CLASSIFY_PRIVATE_IP = 1,
+    NO_CLASSIFY_OFF_THE_RECORD = 2,
+    NO_CLASSIFY_MATCH_CSD_WHITELIST = 3,
+    NO_CLASSIFY_TOO_MANY_REPORTS = 4,
+    NO_CLASSIFY_UNSUPPORTED_MIME_TYPE = 5,
+    NO_CLASSIFY_NO_DATABASE_MANAGER = 6,
+    NO_CLASSIFY_KILLSWITCH = 7,
+    NO_CLASSIFY_CANCEL = 8,
+    NO_CLASSIFY_RESULT_FROM_CACHE = 9,
+    DEPRECATED_NO_CLASSIFY_NOT_HTTP_URL = 10,
+    NO_CLASSIFY_SCHEME_NOT_SUPPORTED = 11,
 
     NO_CLASSIFY_MAX  // Always add new values before this one.
   };

chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

@@ -1172,6 +1172,18 @@ TEST_F(ClientSideDetectionHostTest, TestPreClassificationCheckHttpsUrl) {
   NavigateAndCommit(url);
   WaitAndCheckPreClassificationChecks();
 
+  ExpectStartPhishingDetection(&url);
+  ExpectShouldClassifyForMalwareResult(true);
+}
+
+TEST_F(ClientSideDetectionHostTest,
+       TestPreClassificationCheckNoneHttpOrHttpsUrl) {
+  GURL url("file://host.com/");
+  ExpectPreClassificationChecks(url, &kFalse, &kFalse, &kFalse, &kFalse,
+                                &kFalse, &kFalse, &kFalse, &kFalse);
+  NavigateAndCommit(url);
+  WaitAndCheckPreClassificationChecks();
+
   ExpectStartPhishingDetection(NULL);
   ExpectShouldClassifyForMalwareResult(true);
 }

tools/metrics/histograms/enums.xml

@@ -31827,7 +31827,8 @@ from previous Chrome versions.
   <int value="7" label="KILLSWITCH"/>
   <int value="8" label="CANCEL"/>
   <int value="9" label="RESULT_FROM_CACHE"/>
-  <int value="10" label="NOT_HTTP_URL"/>
+  <int value="10" label="DEPRECATED: NOT_HTTP_URL"/>
+  <int value="11" label="SCHEME_NOT_SUPPORTED"/>
 </enum>
 
 <enum name="SBClientDownloadCheckDownloadStats" type="int">