Switch to the new client-side phishing model that uses Murmurhash for word hashes.

chrome/browser/safe_browsing/client_side_detection_service.cc

 // 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.
 
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 33 matching lines @@
 
 const base::TimeDelta ClientSideDetectionService::kReportsInterval =
     base::TimeDelta::FromDays(1);
 const base::TimeDelta ClientSideDetectionService::kNegativeCacheInterval =
     base::TimeDelta::FromDays(1);
 const base::TimeDelta ClientSideDetectionService::kPositiveCacheInterval =
     base::TimeDelta::FromMinutes(30);
 
 const char ClientSideDetectionService::kClientReportPhishingUrl[] =
     "https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
-// Note: when updatng the model version, don't forget to change the filename
-// in chrome/common/chrome_constants.cc as well, or else existing users won't
-// download the new model.
 const char ClientSideDetectionService::kClientModelUrl[] =
-    "https://ssl.gstatic.com/safebrowsing/csd/client_model_v3.pb";
+    "https://ssl.gstatic.com/safebrowsing/csd/client_model_v4.pb";
 
 struct ClientSideDetectionService::ClientReportInfo {
   scoped_ptr<ClientReportPhishingRequestCallback> callback;
   GURL phishing_url;
 };
 
 ClientSideDetectionService::CacheState::CacheState(bool phish, base::Time time)
     : is_phishing(phish),
       timestamp(time) {}
 
@@ skipping 525 matching lines @@
           model.rule(i).feature(j) > max_index) {
         return false;
       }
     }
   }
   for (int i = 0; i < model.page_term_size(); ++i) {
     if (model.page_term(i) < 0 || model.page_term(i) > max_index) {
       return false;
     }
   }
-  for (int i = 0; i < model.page_word_size(); ++i) {
-    if (model.page_word(i) < 0 || model.page_word(i) > max_index) {
-      return false;
-    }
-  }
   return true;
 }
 
 // static
 bool ClientSideDetectionService::IsFalsePositiveResponse(
     const GURL& url,
     const ClientPhishingResponse& response) {
   if (!response.phishy() || response.whitelist_expression_size() == 0) {
     return false;
   }
@@ skipping 29 matching lines @@
                                                 &whitelist_patterns);
     for (size_t j = 0; j < whitelist_patterns.size(); ++j) {
       if (whitelist_patterns[j] == canonical_url_as_pattern) {
         return true;
       }
     }
   }
   return false;
 }
 }  // namespace safe_browsing