Mostly integrate new malware IP blacklist with the csd client. When

chrome/browser/safe_browsing/client_side_detection_service.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 188 matching lines @@
   for (std::vector<AddressRange>::const_iterator it =
            private_networks_.begin();
        it != private_networks_.end(); ++it) {
     if (net::IPNumberMatchesPrefix(ip_number, it->first, it->second)) {
       return true;
     }
   }
   return false;
 }
 
-bool ClientSideDetectionService::IsBadIpAddress(
-    const std::string& ip_address) const {
-  net::IPAddressNumber ip_number;
-  if (!net::ParseIPLiteralToNumber(ip_address, &ip_number)) {
-    VLOG(2) << "Unable to parse IP address: '" << ip_address << "'";
-    return false;
-  }
-  if (ip_number.size() == net::kIPv4AddressSize) {
-    ip_number = net::ConvertIPv4NumberToIPv6Number(ip_number);
-  }
-  if (ip_number.size() != net::kIPv6AddressSize) {
-    VLOG(2) << "Unable to convert IPv4 address to IPv6: '" << ip_address << "'";
-    return false;  // better safe than sorry.
-  }
-  for (BadSubnetMap::const_iterator it = bad_subnets_.begin();
-       it != bad_subnets_.end(); ++it) {
-    const std::string& mask = it->first;
-    DCHECK_EQ(mask.size(), ip_number.size());
-    std::string subnet(net::kIPv6AddressSize, '.');
-    for (size_t i = 0; i < net::kIPv6AddressSize; ++i) {
-      subnet[i] = ip_number[i] & mask[i];
-    }
-    if (it->second.count(crypto::SHA256HashString(subnet)) > 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
 void ClientSideDetectionService::OnURLFetchComplete(
     const net::URLFetcher* source) {
   std::string data;
   source->GetResponseAsString(&data);
   if (source == model_fetcher_.get()) {
     HandleModelResponse(
         source, source->GetURL(), source->GetStatus(),
         source->GetResponseCode(), source->GetCookies(), data);
   } else if (client_phishing_reports_.find(source) !=
              client_phishing_reports_.end()) {
@@ skipping 461 matching lines @@
 GURL ClientSideDetectionService::GetClientReportUrl(
     const std::string& report_url) {
   GURL url(report_url);
   std::string api_key = google_apis::GetAPIKey();
   if (!api_key.empty())
     url = url.Resolve("?key=" + net::EscapeQueryParamValue(api_key, true));
 
   return url;
 }
 }  // namespace safe_browsing