Change the client-side phishing detection hashing function to

chrome/browser/safe_browsing/client_side_detection_service_unittest.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 <map>
 #include <queue>
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 648 matching lines @@
       ClientSideDetectionService::MODEL_NOT_CHANGED))
       .WillOnce(Invoke(service, &MockClientSideDetectionService::Disable));
   csd_service_->SetEnabled(true);
   EXPECT_FALSE(SendClientReportPhishingRequest(GURL("http://a.com/"), 0.4f));
   Mock::VerifyAndClearExpectations(service);
 }
 
 TEST_F(ClientSideDetectionServiceTest, SanitizeRequestForPingback) {
   ClientPhishingRequest request;
   request.set_url("http://www.us.host.com/blah");
-  request.set_suffix_prefix_hash("hash");
+  request.set_hash_prefix("hash");
   request.set_client_score(0.8f);
   request.set_is_phishing(true);
   AddFeature(std::string(features::kUrlTldToken) + "com", 1.0, &request);
   AddFeature(std::string(features::kUrlDomainToken) + "host", 1.0, &request);
   AddFeature(std::string(features::kUrlOtherHostToken) + "us", 1.0, &request);
   AddFeature(std::string(features::kUrlOtherHostToken) + "www", 1.0, &request);
   AddFeature(features::kUrlNumOtherHostTokensGTOne, 1.0, &request);
   AddFeature(std::string(features::kUrlPathToken) + "blah", 1.0, &request);
   AddFeature(features::kPageHasForms, 1.0, &request);
   AddFeature(std::string(features::kPageTerm) + "term", 1.0, &request);
@@ skipping 22 matching lines @@
   AddNonModelFeature(std::string(features::kSafeBrowsingOriginalUrl) +
                      "http://original.com/", 1.0, &request);
 
   csd_service_.reset(ClientSideDetectionService::Create(NULL));
 
   ClientPhishingRequest sanitized_request;
   csd_service_->SanitizeRequestForPingback(request, &sanitized_request);
 
   // For easier debugging, we'll check the output protobuf fields individually.
   ClientPhishingRequest expected;
-  expected.set_suffix_prefix_hash(request.suffix_prefix_hash());
+  expected.set_hash_prefix(request.hash_prefix());
   expected.set_client_score(request.client_score());
   expected.set_is_phishing(request.is_phishing());
   AddFeature(features::kUrlNumOtherHostTokensGTOne, 1.0, &expected);
   AddFeature(features::kPageHasForms, 1.0, &expected);
   AddFeature(features::kPageImgOtherDomainFreq, 0.5, &expected);
   expected.set_model_version(3);
   AddNonModelFeature(features::kUrlHistoryVisitCount, 5.0, &expected);
 
   EXPECT_FALSE(sanitized_request.has_url());
-  EXPECT_EQ(expected.suffix_prefix_hash(),
-            sanitized_request.suffix_prefix_hash());
+  EXPECT_EQ(expected.hash_prefix(), sanitized_request.hash_prefix());
   EXPECT_FLOAT_EQ(expected.client_score(), sanitized_request.client_score());
   EXPECT_EQ(expected.is_phishing(), sanitized_request.is_phishing());
 
   ASSERT_EQ(expected.feature_map_size(), sanitized_request.feature_map_size());
   for (int i = 0; i < expected.feature_map_size(); ++i) {
     EXPECT_EQ(expected.feature_map(i).name(),
               sanitized_request.feature_map(i).name()) << "Feature " << i;
     EXPECT_DOUBLE_EQ(expected.feature_map(i).value(),
                      sanitized_request.feature_map(i).value())
         << "Feature " << i;
@@ skipping 10 matching lines @@
         << "Non-model feature " << i;
   }
 
   // Also check the serialized forms in case there's a field that we forget
   // to add above.
   EXPECT_EQ(expected.SerializeAsString(),
             sanitized_request.SerializeAsString());
 }
 
 }  // namespace safe_browsing