If we show a SafeBrowsing warning we always send the client-side detection

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/file_util_proxy.h"
 #include "base/logging.h"
 #include "base/time.h"
@@ skipping 243 matching lines @@
 }
 
 void ClientSideDetectionService::StartClientReportPhishingRequest(
     ClientPhishingRequest* verdict,
     ClientReportPhishingRequestCallback* callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   scoped_ptr<ClientPhishingRequest> request(verdict);
   scoped_ptr<ClientReportPhishingRequestCallback> cb(callback);
 
   std::string request_data;
-  if (!request->SerializeToString(&request_data)) {
+  if (!request->SerializeToString(&request_data) && cb.get()) {

[Brian Ryner, 2011/07/19 21:27:10]

This doesn't seem quite right -- don't we want to return early, even if cb is
null?

[noelutz, 2011/07/19 22:28:08]

Done.

     UMA_HISTOGRAM_COUNTS("SBClientPhishing.RequestNotSerialized", 1);
     VLOG(1) << "Unable to serialize the CSD request. Proto file changed?";
     cb->Run(GURL(request->url()), false);
     return;
   }
 
   URLFetcher* fetcher = URLFetcher::Create(0 /* ID is not used */,
                                            GURL(kClientReportPhishingUrl),
                                            URLFetcher::POST,
                                            this);
@@ skipping 54 matching lines @@
 
 void ClientSideDetectionService::HandlePhishingVerdict(
     const URLFetcher* source,
     const GURL& url,
     const net::URLRequestStatus& status,
     int response_code,
     const net::ResponseCookies& cookies,
     const std::string& data) {
   ClientPhishingResponse response;
   scoped_ptr<ClientReportInfo> info(client_phishing_reports_[source]);
+  bool isphishing = false;

[Garrett Casto, 2011/07/19 21:18:48]

is_phishing?

[mattm, 2011/07/19 21:25:55]

nit: is_phishing

[noelutz, 2011/07/19 22:28:08]

Done.

[noelutz, 2011/07/19 22:28:08]

Done.

   if (status.is_success() && RC_REQUEST_OK == response_code &&
       response.ParseFromString(data)) {
     // Cache response, possibly flushing an old one.
     cache_[info->phishing_url] =
         make_linked_ptr(new CacheState(response.phishy(), base::Time::Now()));
-    info->callback->Run(info->phishing_url, response.phishy());
+    isphishing = response.phishy();
   } else {
     DLOG(ERROR) << "Unable to get the server verdict for URL: "
                 << info->phishing_url << " status: " << status.status() << " "
                 << "response_code:" << response_code;
-    info->callback->Run(info->phishing_url, false);
+  }
+  if (info->callback.get()) {
+    info->callback->Run(info->phishing_url, isphishing);
   }
   client_phishing_reports_.erase(source);
   delete source;
 }
 
 bool ClientSideDetectionService::IsInCache(const GURL& url) {
   UpdateCache();
 
   return cache_.find(url) != cache_.end();
 }
@@ skipping 104 matching lines @@
     // |size| bits sets to one.
     std::string mask(net::kIPv6AddressSize, '\x00');
     mask.replace(0, size / 8, size / 8, '\xFF');
     if (size % 8) {
       mask[size / 8] = 0xFF << (8 - (size % 8));
     }
     (*bad_subnets)[mask].insert(model.bad_subnet(i).prefix());
   }
 }
 }  // namespace safe_browsing