Remove thumbnails from client-side phishing detection pingbacks.

For now, we won't be making use of this.

BUG=none
TEST=updated relevant tests

Review URL: http://codereview.chromium.org/6124003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71009 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 34 deletions

diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
index 7ee0bd4..22fe3a7 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
@@ -11,27 +11,12 @@
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/safe_browsing/feature_extractor_clock.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier.h"
-#include "chrome/renderer/safe_browsing/phishing_thumbnailer.h"
-#include "gfx/size.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 
 namespace safe_browsing {
 
-// The view and thumbnail sizes need to match what the server is expecting.
-namespace {
-// The dimensions that the view will be resized to prior to capturing the
-// thumbnail.
-const int kThumbnailViewWidth = 1024;
-const int kThumbnailViewHeight = 768;
-
-// The dimensions that the image will be resized to after it is captured.
-const int kThumbnailWidth = 212;
-const int kThumbnailHeight = 159;
-}  // namespace
-
 PhishingClassifierDelegate::PhishingClassifierDelegate(
     RenderView* render_view,
     PhishingClassifier* classifier)
@@ -129,20 +114,10 @@ void PhishingClassifierDelegate::ClassificationDone(bool is_phishy,
     return;
   }
 
-  SkBitmap thumbnail = GrabPhishingThumbnail(
-      render_view_,
-      gfx::Size(kThumbnailViewWidth, kThumbnailViewHeight),
-      gfx::Size(kThumbnailWidth, kThumbnailHeight));
-  if (thumbnail.isNull()) {
-    LOG(ERROR) << "Unable to capture thumbnail.";
-    return;
-  }
-
   render_view_->Send(new ViewHostMsg_DetectedPhishingSite(
       render_view_->routing_id(),
       last_url_sent_to_classifier_,
-      phishy_score,
-      thumbnail));
+      phishy_score));
 }
 
 GURL PhishingClassifierDelegate::StripToplevelUrl() {
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
index edb5394..55469c7 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
@@ -17,7 +17,6 @@
 #include "chrome/renderer/safe_browsing/scorer.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
@@ -70,13 +69,10 @@ class PhishingClassifierDelegateTest : public RenderViewFakeResourcesTest {
     return handled;
   }
 
-  void OnDetectedPhishingSite(GURL phishing_url,
-                              double phishing_score,
-                              SkBitmap thumbnail) {
+  void OnDetectedPhishingSite(GURL phishing_url, double phishing_score) {
     detected_phishing_site_ = true;
     detected_url_ = phishing_url;
     detected_score_ = phishing_score;
-    detected_thumbnail_ = thumbnail;
     message_loop_.Quit();
   }
 
@@ -88,7 +84,6 @@ class PhishingClassifierDelegateTest : public RenderViewFakeResourcesTest {
     detected_phishing_site_ = false;
     detected_url_ = GURL();
     detected_score_ = -1.0;
-    detected_thumbnail_ = SkBitmap();
 
     delegate->ClassificationDone(is_phishy, phishy_score);
     message_loop_.Run();
@@ -97,7 +92,6 @@ class PhishingClassifierDelegateTest : public RenderViewFakeResourcesTest {
   bool detected_phishing_site_;
   GURL detected_url_;
   double detected_score_;
-  SkBitmap detected_thumbnail_;
 };
 
 TEST_F(PhishingClassifierDelegateTest, Navigation) {
@@ -254,7 +248,6 @@ TEST_F(PhishingClassifierDelegateTest, DetectedPhishingSite) {
   EXPECT_TRUE(detected_phishing_site_);
   EXPECT_EQ(GURL("http://host.com/"), detected_url_);
   EXPECT_EQ(0.8, detected_score_);
-  EXPECT_FALSE(detected_thumbnail_.isNull());
 
   // The delegate will cancel pending classification on destruction.
   EXPECT_CALL(*classifier, CancelPendingClassification());