Componentize safe_browsing: decouple threat_details* from the chrome/ layer.

chrome/browser/safe_browsing/threat_details_unittest.cc

 // Copyright (c) 2012 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 <stdint.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 141 matching lines @@
 }
 
 // Lets us provide a MockURLRequestContext with an HTTP Cache we pre-populate.
 // Also exposes the constructor.
 class ThreatDetailsWrap : public ThreatDetails {
  public:
   ThreatDetailsWrap(
       SafeBrowsingUIManager* ui_manager,
       WebContents* web_contents,
       const security_interstitials::UnsafeResource& unsafe_resource,
-      net::URLRequestContextGetter* request_context_getter)
-      : ThreatDetails(ui_manager, web_contents, unsafe_resource) {
+      net::URLRequestContextGetter* request_context_getter,
+      history::HistoryService* history_service)
+      : ThreatDetails(ui_manager,
+                      web_contents,
+                      unsafe_resource,
+                      request_context_getter,
+                      history_service) {
     request_context_getter_ = request_context_getter;
   }
 
  private:
   ~ThreatDetailsWrap() override {}
 };
 
 class MockSafeBrowsingUIManager : public SafeBrowsingUIManager {
  public:
   base::RunLoop* run_loop_;
@@ skipping 203 matching lines @@
           web_contents()->GetMainFrame(), 0 /* nav_entry_id */,
           true /* did_create_new_entry */, GURL(kLandingURL),
           content::Referrer(GURL(kReferrerURL),
                             blink::WebReferrerPolicyDefault),
           ui::PAGE_TRANSITION_TYPED);
 
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_URL_MALWARE, true /* is_subresource */,
                GURL(kThreatURL));
 
-  scoped_refptr<ThreatDetailsWrap> report =
-      new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
+  scoped_refptr<ThreatDetailsWrap> report = new ThreatDetailsWrap(
+      ui_manager_.get(), web_contents(), resource, NULL, history_service());
 
   std::string serialized = WaitForSerializedReport(
       report.get(), true /* did_proceed*/, 1 /* num_visit */);
 
   ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
   ClientSafeBrowsingReportRequest expected;
   expected.set_type(ClientSafeBrowsingReportRequest::URL_MALWARE);
   expected.set_url(kThreatURL);
@@ skipping 22 matching lines @@
 // subresource has a different original_url.
 TEST_F(ThreatDetailsTest, ThreatSubResourceWithOriginalUrl) {
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kLandingURL));
 
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_URL_PHISHING,
                true /* is_subresource */, GURL(kThreatURL));
   resource.original_url = GURL(kOriginalLandingURL);
 
-  scoped_refptr<ThreatDetailsWrap> report =
-      new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
+  scoped_refptr<ThreatDetailsWrap> report = new ThreatDetailsWrap(
+      ui_manager_.get(), web_contents(), resource, NULL, history_service());
 
   std::string serialized = WaitForSerializedReport(
       report.get(), false /* did_proceed*/, 1 /* num_visit */);
 
   ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
   ClientSafeBrowsingReportRequest expected;
   expected.set_type(ClientSafeBrowsingReportRequest::URL_PHISHING);
   expected.set_url(kThreatURL);
@@ skipping 23 matching lines @@
 
 // Tests creating a threat report of a UwS page with data from the renderer.
 TEST_F(ThreatDetailsTest, ThreatDOMDetails) {
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kLandingURL));
 
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_URL_UNWANTED,
                true /* is_subresource */, GURL(kThreatURL));
 
-  scoped_refptr<ThreatDetailsWrap> report =
-      new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
+  scoped_refptr<ThreatDetailsWrap> report = new ThreatDetailsWrap(
+      ui_manager_.get(), web_contents(), resource, NULL, history_service());
 
   // Send a message from the DOM, with 2 nodes, a parent and a child.
   std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
   SafeBrowsingHostMsg_ThreatDOMDetails_Node child_node;
   child_node.url = GURL(kDOMChildURL);
   child_node.tag_name = "iframe";
   child_node.parent = GURL(kDOMParentURL);
   child_node.attributes.push_back(std::make_pair("src", kDOMChildURL));
   params.push_back(child_node);
   SafeBrowsingHostMsg_ThreatDOMDetails_Node parent_node;
@@ skipping 176 matching lines @@
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kLandingURL));
 
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_URL_UNWANTED,
                true /* is_subresource */, GURL(kThreatURL));
 
   // Send both sets of nodes, from different render frames.
   {
     scoped_refptr<ThreatDetailsWrap> report = new ThreatDetailsWrap(
-        ui_manager_.get(), web_contents(), resource, NULL);
+        ui_manager_.get(), web_contents(), resource, NULL, history_service());
 
     // We call AddDOMDetails directly so we can specify different render frame
     // IDs.
     report->AddDOMDetails(100, GURL(kDOMParentURL), outer_params);
     report->AddDOMDetails(200, GURL(kDOMChildURL), inner_params);
     std::string serialized = WaitForSerializedReport(
         report.get(), false /* did_proceed*/, 0 /* num_visit */);
     ClientSafeBrowsingReportRequest actual;
     actual.ParseFromString(serialized);
     VerifyResults(actual, expected);
@@ skipping 23 matching lines @@
     elem_dom_outer_div->set_id(2);
     elem_dom_outer_div->clear_child_ids();
     elem_dom_outer_div->add_child_ids(3);
     elem_dom_outer_iframe->set_id(3);
     elem_dom_outer_iframe->set_resource_id(res_dom_child->id());
     elem_dom_outer_iframe->clear_child_ids();
     elem_dom_outer_iframe->add_child_ids(0);
     elem_dom_outer_iframe->add_child_ids(1);
 
     scoped_refptr<ThreatDetailsWrap> report = new ThreatDetailsWrap(
-        ui_manager_.get(), web_contents(), resource, NULL);
+        ui_manager_.get(), web_contents(), resource, NULL, history_service());
 
     // We call AddDOMDetails directly so we can specify different render frame
     // IDs.
     report->AddDOMDetails(200, GURL(kDOMChildURL), inner_params);
     report->AddDOMDetails(100, GURL(kDOMParentURL), outer_params);
     std::string serialized = WaitForSerializedReport(
         report.get(), false /* did_proceed*/, 0 /* num_visit */);
     ClientSafeBrowsingReportRequest actual;
     actual.ParseFromString(serialized);
     VerifyResults(actual, expected);
@@ skipping 88 matching lines @@
   pb_element->set_resource_id(4);
   pb_element->add_attribute()->set_name("src");
   pb_element->mutable_attribute(0)->set_value(kDOMChildUrl2);
 
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kLandingURL));
 
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_URL_UNWANTED,
                true /* is_subresource */, GURL(kThreatURL));
-  scoped_refptr<ThreatDetailsWrap> report =
-      new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
+  scoped_refptr<ThreatDetailsWrap> report = new ThreatDetailsWrap(
+      ui_manager_.get(), web_contents(), resource, NULL, history_service());
   base::HistogramTester histograms;
 
   // Send both sets of nodes, from different render frames. We call
   // AddDOMDetails directly so we can specify different render frame IDs.
   report->AddDOMDetails(100, GURL(kDOMParentURL), outer_params);
   // The inner frame was using a data URL so its last committed URL is empty.
   report->AddDOMDetails(200, GURL(), inner_params);
 
   std::string serialized = WaitForSerializedReport(
       report.get(), false /* did_proceed*/, 0 /* num_visit */);
@@ skipping 14 matching lines @@
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_URL_MALWARE, true /* is_subresource */,
                GURL(kThreatURL));
   resource.original_url = GURL(kOriginalLandingURL);
 
   // add some redirect urls
   resource.redirect_urls.push_back(GURL(kFirstRedirectURL));
   resource.redirect_urls.push_back(GURL(kSecondRedirectURL));
   resource.redirect_urls.push_back(GURL(kThreatURL));
 
-  scoped_refptr<ThreatDetailsWrap> report =
-      new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
+  scoped_refptr<ThreatDetailsWrap> report = new ThreatDetailsWrap(
+      ui_manager_.get(), web_contents(), resource, NULL, history_service());
 
   std::string serialized = WaitForSerializedReport(
       report.get(), true /* did_proceed*/, 0 /* num_visit */);
   ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
   ClientSafeBrowsingReportRequest expected;
   expected.set_type(ClientSafeBrowsingReportRequest::URL_MALWARE);
   expected.set_url(kThreatURL);
   expected.set_page_url(kLandingURL);
@@ skipping 49 matching lines @@
                        content::Referrer(GURL(kReferrerURL),
                                          blink::WebReferrerPolicyDefault),
                        ui::PAGE_TRANSITION_TYPED, std::string());
 
   // Create UnsafeResource for the pending main page load.
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_URL_MALWARE,
                false /* is_subresource */, GURL(kLandingURL));
 
   // Start ThreatDetails collection.
-  scoped_refptr<ThreatDetailsWrap> report =
-      new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
+  scoped_refptr<ThreatDetailsWrap> report = new ThreatDetailsWrap(
+      ui_manager_.get(), web_contents(), resource, NULL, history_service());
 
   // Simulate clicking don't proceed.
   controller().DiscardNonCommittedEntries();
 
   // Finish ThreatDetails collection.
   std::string serialized = WaitForSerializedReport(
       report.get(), false /* did_proceed*/, 1 /* num_visit */);
 
   ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
@@ skipping 39 matching lines @@
   InitResource(&resource, SB_THREAT_TYPE_URL_MALWARE, true /* is_subresource */,
                GURL(kThreatURL));
 
   // Start a pending load before creating ThreatDetails.
   controller().LoadURL(GURL(kPendingURL),
                        content::Referrer(GURL(kPendingReferrerURL),
                                          blink::WebReferrerPolicyDefault),
                        ui::PAGE_TRANSITION_TYPED, std::string());
 
   // Do ThreatDetails collection.
-  scoped_refptr<ThreatDetailsWrap> report =
-      new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
+  scoped_refptr<ThreatDetailsWrap> report = new ThreatDetailsWrap(
+      ui_manager_.get(), web_contents(), resource, NULL, history_service());
   std::string serialized = WaitForSerializedReport(
       report.get(), true /* did_proceed*/, 1 /* num_visit */);
 
   ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
   ClientSafeBrowsingReportRequest expected;
   expected.set_type(ClientSafeBrowsingReportRequest::URL_MALWARE);
   expected.set_url(kThreatURL);
   expected.set_page_url(kLandingURL);
@@ skipping 23 matching lines @@
   EXPECT_EQ(nullptr, controller().GetLastCommittedEntry());
   EXPECT_EQ(nullptr, controller().GetPendingEntry());
 
   // Simulate a subresource malware hit (this could happen if the WebContents
   // was created with window.open, and had content injected into it).
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_URL_MALWARE, true /* is_subresource */,
                GURL(kThreatURL));
 
   // Do ThreatDetails collection.
-  scoped_refptr<ThreatDetailsWrap> report =
-      new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
+  scoped_refptr<ThreatDetailsWrap> report = new ThreatDetailsWrap(
+      ui_manager_.get(), web_contents(), resource, NULL, history_service());
   std::string serialized = WaitForSerializedReport(
       report.get(), true /* did_proceed*/, 1 /* num_visit */);
 
   ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
   ClientSafeBrowsingReportRequest expected;
   expected.set_type(ClientSafeBrowsingReportRequest::URL_MALWARE);
   expected.set_url(kThreatURL);
   expected.set_did_proceed(true);
@@ skipping 11 matching lines @@
 TEST_F(ThreatDetailsTest, HTTPCache) {
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kLandingURL));
 
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL,
                true /* is_subresource */, GURL(kThreatURL));
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource,
-                            profile()->GetRequestContext());
+                            profile()->GetRequestContext(), history_service());
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&FillCache,
                  base::RetainedRef(profile()->GetRequestContext())));
 
   // The cache collection starts after the IPC from the DOM is fired.
   std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
   report->OnReceivedThreatDOMDetails(main_rfh(), params);
 
@@ skipping 62 matching lines @@
 TEST_F(ThreatDetailsTest, HttpsResourceSanitization) {
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kLandingURL));
 
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL,
                true /* is_subresource */, GURL(kThreatURLHttps));
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource,
-                            profile()->GetRequestContext());
+                            profile()->GetRequestContext(), history_service());
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&FillCacheHttps,
                  base::RetainedRef(profile()->GetRequestContext())));
 
   // The cache collection starts after the IPC from the DOM is fired.
   std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
   report->OnReceivedThreatDOMDetails(main_rfh(), params);
 
@@ skipping 59 matching lines @@
 TEST_F(ThreatDetailsTest, HTTPCacheNoEntries) {
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kLandingURL));
 
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL,
                true /* is_subresource */, GURL(kThreatURL));
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource,
-                            profile()->GetRequestContext());
+                            profile()->GetRequestContext(), history_service());
 
   // No call to FillCache
 
   // The cache collection starts after the IPC from the DOM is fired.
   std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
   report->OnReceivedThreatDOMDetails(main_rfh(), params);
 
   // Let the cache callbacks complete.
   base::RunLoop().RunUntilIdle();
 
@@ skipping 34 matching lines @@
   AddPageToHistory(baseurl, &redirects);
   // Wait for history service operation finished.
   profile()->BlockUntilHistoryProcessesPendingRequests();
 
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kLandingURL));
 
   UnsafeResource resource;
   InitResource(&resource, SB_THREAT_TYPE_URL_MALWARE, true /* is_subresource */,
                GURL(kThreatURL));
-  scoped_refptr<ThreatDetailsWrap> report =
-      new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
+  scoped_refptr<ThreatDetailsWrap> report = new ThreatDetailsWrap(
+      ui_manager_.get(), web_contents(), resource, NULL, history_service());
 
   // The redirects collection starts after the IPC from the DOM is fired.
   std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
   report->OnReceivedThreatDOMDetails(main_rfh(), params);
 
   // Let the redirects callbacks complete.
   base::RunLoop().RunUntilIdle();
 
   std::string serialized = WaitForSerializedReport(
       report.get(), true /* did_proceed*/, 1 /* num_visit */);
@@ skipping 21 matching lines @@
   pb_resource->set_parent_id(3);
   pb_resource->set_url(kSecondRedirectURL);
   pb_resource = expected.add_resources();
   pb_resource->set_id(3);
   pb_resource->set_url(kFirstRedirectURL);
 
   VerifyResults(actual, expected);
 }
 
 }  // namespace safe_browsing