Remove thumbnails from the ClientSideDetectionService.

chrome/browser/safe_browsing/client_side_detection_service_unittest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
 #include "base/task.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/csd.pb.h"
 #include "chrome/common/net/test_url_fetcher_factory.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_status.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace safe_browsing {
 
 class ClientSideDetectionServiceTest : public testing::Test {
  protected:
   virtual void SetUp() {
     file_thread_.reset(new BrowserThread(BrowserThread::FILE, &msg_loop_));
 
     factory_.reset(new FakeURLFetcherFactory());
     URLFetcher::set_factory(factory_.get());
@@ skipping 19 matching lines @@
   }
 
   std::string ReadModelFile(base::PlatformFile model_file) {
     char buf[1024];
     int n = base::ReadPlatformFile(model_file, 0, buf, 1024);
     EXPECT_LE(0, n);
     return (n < 0) ? "" : std::string(buf, n);
   }
 
   bool SendClientReportPhishingRequest(const GURL& phishing_url,
-                                       double score,
-                                       SkBitmap thumbnail) {
+                                       double score) {
     csd_service_->SendClientReportPhishingRequest(
         phishing_url,
         score,
-        thumbnail,
         NewCallback(this, &ClientSideDetectionServiceTest::SendRequestDone));
     phishing_url_ = phishing_url;
     msg_loop_.Run();  // Waits until callback is called.
     return is_phishing_;
   }
 
   void SetModelFetchResponse(std::string response_data, bool success) {
     factory_->SetFakeResponse(ClientSideDetectionService::kClientModelUrl,
                               response_data, success);
   }
@@ skipping 77 matching lines @@
   msg_loop_.RunAllPending();
 }
 
 TEST_F(ClientSideDetectionServiceTest, SendClientReportPhishingRequest) {
   SetModelFetchResponse("bogus model", true /* success */);
   ScopedTempDir tmp_dir;
   ASSERT_TRUE(tmp_dir.CreateUniqueTempDir());
   csd_service_.reset(ClientSideDetectionService::Create(
       tmp_dir.path().AppendASCII("model"), NULL));
 
-  // Invalid thumbnail.
-  SkBitmap thumbnail;
   GURL url("http://a.com/");
   double score = 0.4;  // Some random client score.
-  EXPECT_FALSE(SendClientReportPhishingRequest(url, score, thumbnail));
-
-  // Valid thumbnail but the server returns an error.
-  thumbnail.setConfig(SkBitmap::kARGB_8888_Config, 100, 100);
-  ASSERT_TRUE(thumbnail.allocPixels());
-  thumbnail.eraseRGB(255, 0, 0);
-  SetClientReportPhishingResponse("", false /* fail */);
-  EXPECT_FALSE(SendClientReportPhishingRequest(url, score, thumbnail));
 
   // Invalid response body from the server.
   SetClientReportPhishingResponse("invalid proto response", true /* success */);
-  EXPECT_FALSE(SendClientReportPhishingRequest(url, score, thumbnail));
+  EXPECT_FALSE(SendClientReportPhishingRequest(url, score));
 
   // Normal behavior.
   ClientPhishingResponse response;
   response.set_phishy(true);
   SetClientReportPhishingResponse(response.SerializeAsString(),
                                   true /* success */);
-  EXPECT_TRUE(SendClientReportPhishingRequest(url, score, thumbnail));
+  EXPECT_TRUE(SendClientReportPhishingRequest(url, score));
   response.set_phishy(false);
   SetClientReportPhishingResponse(response.SerializeAsString(),
                                   true /* success */);
-  EXPECT_FALSE(SendClientReportPhishingRequest(url, score, thumbnail));
+  EXPECT_FALSE(SendClientReportPhishingRequest(url, score));
 }
 
 }  // namespace safe_browsing