Send back the URL that matched the SafeBrowsing list with the CSD ping.

chrome/browser/safe_browsing/client_side_detection_host_unittest.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 "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/safe_browsing/browser_feature_extractor.h"
 #include "chrome/browser/safe_browsing/client_side_detection_host.h"
@@ skipping 223 matching lines @@
     MessageLoop::current()->RunAllPending();
     EXPECT_TRUE(Mock::VerifyAndClear(csd_service_.get()));
     EXPECT_TRUE(Mock::VerifyAndClear(sb_service_.get()));
     EXPECT_TRUE(Mock::VerifyAndClear(mock_profile_));
   }
 
   void SetFeatureExtractor(BrowserFeatureExtractor* extractor) {
     csd_host_->feature_extractor_.reset(extractor);
   }
 
-  void SetUnsafeUniquePageIdToCurrent() {
-    csd_host_->unsafe_unique_page_id_ =
-        contents()->controller().GetActiveEntry()->unique_id();
+  void SetUnsafeResourceToCurrent() {
+    SafeBrowsingService::UnsafeResource resource;
+    resource.url = GURL("http://www.malware.com/");
+    resource.original_url = contents()->GetURL();
+    resource.is_subresource = true;
+    resource.threat_type = SafeBrowsingService::URL_MALWARE;
+    resource.client = NULL;
+    resource.render_process_host_id = contents()->GetRenderProcessHost()->id();
+    resource.render_view_id = contents()->render_view_host()->routing_id();
+    csd_host_->OnSafeBrowsingHit(resource);
     ASSERT_TRUE(csd_host_->DidShowSBInterstitial());
+    ASSERT_TRUE(csd_host_->unsafe_resource_.get());
+    // Test that the resource above was copied.
+    EXPECT_EQ(resource.url, csd_host_->unsafe_resource_->url);
+    EXPECT_EQ(resource.original_url, csd_host_->unsafe_resource_->original_url);
+    EXPECT_EQ(resource.is_subresource,
+              csd_host_->unsafe_resource_->is_subresource);
+    EXPECT_EQ(resource.threat_type, csd_host_->unsafe_resource_->threat_type);
+    EXPECT_EQ(resource.client, csd_host_->unsafe_resource_->client);

[mattm, 2011/08/01 23:19:35]

nit: shouldn't this check it gets NULLed?

[noelutz, 2011/08/01 23:26:49]

good point. done.

+    EXPECT_EQ(resource.render_process_host_id,
+              csd_host_->unsafe_resource_->render_process_host_id);
+    EXPECT_EQ(resource.render_view_id,
+              csd_host_->unsafe_resource_->render_view_id);
   }
 
  protected:
   scoped_ptr<ClientSideDetectionHost> csd_host_;
   scoped_ptr<StrictMock<MockClientSideDetectionService> > csd_service_;
   scoped_refptr<StrictMock<MockSafeBrowsingService> > sb_service_;
   MockTestingProfile* mock_profile_;  // We don't own this object
 
  private:
   scoped_ptr<BrowserThread> ui_thread_;
@@ skipping 254 matching lines @@
   ClientPhishingRequest verdict;
   verdict.set_url(url.spec());
   verdict.set_client_score(0.1f);
   verdict.set_is_phishing(false);
 
   // First we have to navigate to the URL to set the unique page ID.
   ExpectPreClassificationChecks(url, &kFalse, &kFalse, &kFalse, &kFalse,
                                 &kFalse, &kFalse);
   NavigateAndCommit(url);
   WaitAndCheckPreClassificationChecks();
-  SetUnsafeUniquePageIdToCurrent();
+  SetUnsafeResourceToCurrent();
 
   EXPECT_CALL(*csd_service_,
               SendClientReportPhishingRequest(
                   Pointee(PartiallyEqualVerdict(verdict)), IsNull()))
       .WillOnce(DoAll(DeleteArg<0>(), QuitUIMessageLoop()));
   OnPhishingDetectionDone(verdict.SerializeAsString());
   MessageLoop::current()->Run();
   EXPECT_TRUE(Mock::VerifyAndClear(csd_service_.get()));
 }
 
@@ skipping 178 matching lines @@
   EXPECT_TRUE(Mock::VerifyAndClear(sb_service_.get()));
   EXPECT_EQ(url, resource.url);
   EXPECT_EQ(url, resource.original_url);
   delete resource.client;
   msg = process()->sink().GetFirstMessageMatching(
       SafeBrowsingMsg_StartPhishingDetection::ID);
   ASSERT_FALSE(msg);
 }
 
 }  // namespace safe_browsing