Remove thumbnails from the ClientSideDetectionService.

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_path.h"
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
-#include "base/ref_counted_memory.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/safe_browsing/csd.pb.h"
 #include "chrome/common/net/http_return.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "chrome/common/net/url_request_context_getter.h"
-#include "gfx/codec/png_codec.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace safe_browsing {
 
 const char ClientSideDetectionService::kClientReportPhishingUrl[] =
     "https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
 const char ClientSideDetectionService::kClientModelUrl[] =
     "https://ssl.gstatic.com/safebrowsing/csd/client_model_v0.pb";
 
 struct ClientSideDetectionService::ClientReportInfo {
   scoped_ptr<ClientReportPhishingRequestCallback> callback;
@@ skipping 48 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   MessageLoop::current()->PostTask(
       FROM_HERE,
       method_factory_.NewRunnableMethod(
           &ClientSideDetectionService::StartGetModelFile, callback));
 }
 
 void ClientSideDetectionService::SendClientReportPhishingRequest(
     const GURL& phishing_url,
     double score,
-    SkBitmap thumbnail,
     ClientReportPhishingRequestCallback* callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   MessageLoop::current()->PostTask(
       FROM_HERE,
       method_factory_.NewRunnableMethod(
           &ClientSideDetectionService::StartClientReportPhishingRequest,
-          phishing_url, score, thumbnail, callback));
+          phishing_url, score, callback));
 }
 
 void ClientSideDetectionService::OnURLFetchComplete(
     const URLFetcher* source,
     const GURL& url,
     const net::URLRequestStatus& status,
     int response_code,
     const ResponseCookies& cookies,
     const std::string& data) {
   if (source == model_fetcher_) {
@@ skipping 106 matching lines @@
     // The model is either in READY or ERROR state which means we can
     // call the callback right away.
     callback->Run(model_file_);
     delete callback;
   }
 }
 
 void ClientSideDetectionService::StartClientReportPhishingRequest(
     const GURL& phishing_url,
     double score,
-    SkBitmap thumbnail,
     ClientReportPhishingRequestCallback* callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   scoped_ptr<ClientReportPhishingRequestCallback> cb(callback);
-  // The server expects an encoded PNG image.
-  scoped_refptr<RefCountedBytes> thumbnail_data(new RefCountedBytes);
-  SkAutoLockPixels lock(thumbnail);
-  if (!thumbnail.readyToDraw() ||
-      !gfx::PNGCodec::EncodeBGRASkBitmap(thumbnail,
-                                         true /* discard_transparency */,
-                                         &thumbnail_data->data)) {
-    cb->Run(phishing_url, false);
-    return;
-  }
 
   ClientPhishingRequest request;
   request.set_url(phishing_url.spec());
   request.set_client_score(static_cast<float>(score));
-  request.set_snapshot(reinterpret_cast<const char*>(thumbnail_data->front()),
-                       thumbnail_data->size());
   std::string request_data;
   if (!request.SerializeToString(&request_data)) {
     // For consistency, we always call the callback asynchronously, rather than
     // directly from this method.
     LOG(ERROR) << "Unable to serialize the CSD request. Proto file changed?";
     cb->Run(phishing_url, false);
     return;
   }
 
   URLFetcher* fetcher = URLFetcher::Create(0 /* ID is not used */,
@@ skipping 58 matching lines @@
     info->callback->Run(info->phishing_url, response.phishy());
   } else {
     DLOG(ERROR) << "Unable to get the server verdict for URL: "
                 << info->phishing_url;
     info->callback->Run(info->phishing_url, false);
   }
   client_phishing_reports_.erase(source);
 }
 
 }  // namespace safe_browsing