Collect threat details for phishing and UwS

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 <algorithm>
 
 #include "base/bind.h"
 #include "base/pickle.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
@@ skipping 24 matching lines @@
 
 // Mixture of HTTP and HTTPS.  No special treatment for HTTPS.
 static const char* kOriginalLandingURL =
     "http://www.originallandingpage.com/with/path";
 static const char* kDOMChildURL = "https://www.domparent.com/with/path";
 static const char* kDOMParentURL = "https://www.domchild.com/with/path";
 static const char* kFirstRedirectURL = "http://redirectone.com/with/path";
 static const char* kSecondRedirectURL = "https://redirecttwo.com/with/path";
 static const char* kReferrerURL = "http://www.referrer.com/with/path";
 
-static const char* kMalwareURL = "http://www.malware.com/with/path";
-static const char* kMalwareHeaders =
+static const char* kThreatURL = "http://www.threat.com/with/path";
+static const char* kThreatHeaders =
     "HTTP/1.1 200 OK\n"
     "Content-Type: image/jpeg\n";
-static const char* kMalwareData = "exploit();";
+static const char* kThreatData = "exploit();";
 
 static const char* kLandingURL = "http://www.landingpage.com/with/path";
 static const char* kLandingHeaders =
     "HTTP/1.1 200 OK\n"
     "Content-Type: text/html\n"
     "Content-Length: 1024\n"
     "Set-Cookie: tastycookie\n";  // This header is stripped.
 static const char* kLandingData =
-    "<iframe src='http://www.malware.com/with/path'>";
+    "<iframe src='http://www.threat.com/with/path'>";
 
 using content::BrowserThread;
 using content::WebContents;
-using safe_browsing::ClientMalwareReportRequest;
+using safe_browsing::ClientSafeBrowsingReportRequest;
 
 namespace {
 
 void WriteHeaders(disk_cache::Entry* entry, const std::string& headers) {
   net::HttpResponseInfo responseinfo;
   std::string raw_headers =
       net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.size());
   responseinfo.socket_address = net::HostPortPair("1.2.3.4", 80);
   responseinfo.headers = new net::HttpResponseHeaders(raw_headers);
 
@@ skipping 42 matching lines @@
 
 void FillCache(net::URLRequestContextGetter* context_getter) {
   net::TestCompletionCallback cb;
   disk_cache::Backend* cache;
   int rv = context_getter->GetURLRequestContext()
                ->http_transaction_factory()
                ->GetCache()
                ->GetBackend(&cache, cb.callback());
   ASSERT_EQ(net::OK, cb.GetResult(rv));
 
-  WriteToEntry(cache, kMalwareURL, kMalwareHeaders, kMalwareData);
+  WriteToEntry(cache, kThreatURL, kThreatHeaders, kThreatData);
   WriteToEntry(cache, kLandingURL, kLandingHeaders, kLandingData);
 }
 
 // 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,
@@ skipping 52 matching lines @@
     ASSERT_TRUE(profile()->CreateHistoryService(true /* delete_file */,
                                                 false /* no_db */));
   }
 
   void TearDown() override {
     profile()->DestroyHistoryService();
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   static bool ResourceLessThan(
-      const ClientMalwareReportRequest::Resource* lhs,
-      const ClientMalwareReportRequest::Resource* rhs) {
+      const ClientSafeBrowsingReportRequest::Resource* lhs,
+      const ClientSafeBrowsingReportRequest::Resource* rhs) {
     return lhs->id() < rhs->id();
   }
 
   std::string WaitForSerializedReport(ThreatDetails* report,
                                       bool did_proceed,
                                       int num_visit) {
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                             base::Bind(&ThreatDetails::FinishCollection, report,
                                        did_proceed, num_visit));
     // Wait for the callback (SendSerializedThreatDetails).
     DVLOG(1) << "Waiting for SendSerializedThreatDetails";
     base::RunLoop run_loop;
     ui_manager_->SetRunLoopToQuit(&run_loop);
     run_loop.Run();
     return ui_manager_->GetSerialized();
   }
 
   history::HistoryService* history_service() {
     return HistoryServiceFactory::GetForProfile(
         profile(), ServiceAccessType::EXPLICIT_ACCESS);
   }
 
  protected:
   void InitResource(UnsafeResource* resource,
+                    SBThreatType threat_type,
                     bool is_subresource,
                     const GURL& url) {
     resource->url = url;
     resource->is_subresource = is_subresource;
-    resource->threat_type = SB_THREAT_TYPE_URL_MALWARE;
+    resource->threat_type = threat_type;
     resource->render_process_host_id =
         web_contents()->GetRenderProcessHost()->GetID();
     resource->render_view_id =
         web_contents()->GetRenderViewHost()->GetRoutingID();
   }
 
-  void VerifyResults(const ClientMalwareReportRequest& report_pb,
-                     const ClientMalwareReportRequest& expected_pb) {
-    EXPECT_EQ(expected_pb.malware_url(), report_pb.malware_url());
+  void VerifyResults(const ClientSafeBrowsingReportRequest& report_pb,
+                     const ClientSafeBrowsingReportRequest& expected_pb) {
+    EXPECT_EQ(expected_pb.type(), report_pb.type());
+    EXPECT_EQ(expected_pb.url(), report_pb.url());
     EXPECT_EQ(expected_pb.page_url(), report_pb.page_url());
     EXPECT_EQ(expected_pb.referrer_url(), report_pb.referrer_url());
     EXPECT_EQ(expected_pb.did_proceed(), report_pb.did_proceed());
     EXPECT_EQ(expected_pb.has_repeat_visit(), report_pb.has_repeat_visit());
     if (expected_pb.has_repeat_visit() && report_pb.has_repeat_visit()) {
       EXPECT_EQ(expected_pb.repeat_visit(), report_pb.repeat_visit());
     }
 
     ASSERT_EQ(expected_pb.resources_size(), report_pb.resources_size());
     // Sort the resources, to make the test deterministic
-    std::vector<const ClientMalwareReportRequest::Resource*> resources;
+    std::vector<const ClientSafeBrowsingReportRequest::Resource*> resources;
     for (int i = 0; i < report_pb.resources_size(); ++i) {
-      const ClientMalwareReportRequest::Resource& resource =
+      const ClientSafeBrowsingReportRequest::Resource& resource =
           report_pb.resources(i);
       resources.push_back(&resource);
     }
     std::sort(resources.begin(), resources.end(),
               &ThreatDetailsTest::ResourceLessThan);
 
-    std::vector<const ClientMalwareReportRequest::Resource*> expected;
+    std::vector<const ClientSafeBrowsingReportRequest::Resource*> expected;
     for (int i = 0; i < report_pb.resources_size(); ++i) {
-      const ClientMalwareReportRequest::Resource& resource =
+      const ClientSafeBrowsingReportRequest::Resource& resource =
           expected_pb.resources(i);
       expected.push_back(&resource);
     }
     std::sort(expected.begin(), expected.end(),
               &ThreatDetailsTest::ResourceLessThan);
 
     for (uint32 i = 0; i < expected.size(); ++i) {
       VerifyResource(resources[i], expected[i]);
     }
 
     EXPECT_EQ(expected_pb.complete(), report_pb.complete());
   }
 
-  void VerifyResource(const ClientMalwareReportRequest::Resource* resource,
-                      const ClientMalwareReportRequest::Resource* expected) {
+  void VerifyResource(
+      const ClientSafeBrowsingReportRequest::Resource* resource,
+      const ClientSafeBrowsingReportRequest::Resource* expected) {
     EXPECT_EQ(expected->id(), resource->id());
     EXPECT_EQ(expected->url(), resource->url());
     EXPECT_EQ(expected->parent_id(), resource->parent_id());
     ASSERT_EQ(expected->child_ids_size(), resource->child_ids_size());
     for (int i = 0; i < expected->child_ids_size(); i++) {
       EXPECT_EQ(expected->child_ids(i), resource->child_ids(i));
     }
 
     // Verify HTTP Responses
     if (expected->has_response()) {
@@ skipping 30 matching lines @@
     redirects->push_back(url);
     history_service()->AddPage(url, base::Time::Now(),
                                reinterpret_cast<history::ContextID>(1), 0,
                                GURL(), *redirects, ui::PAGE_TRANSITION_TYPED,
                                history::SOURCE_BROWSED, false);
   }
 
   scoped_refptr<MockSafeBrowsingUIManager> ui_manager_;
 };
 
-// Tests creating a simple malware report.
-TEST_F(ThreatDetailsTest, MalwareSubResource) {
+// Tests creating a simple threat report of a malware URL.
+TEST_F(ThreatDetailsTest, ThreatSubResource) {
   // Start a load.
   controller().LoadURL(
       GURL(kLandingURL),
       content::Referrer(GURL(kReferrerURL), blink::WebReferrerPolicyDefault),
       ui::PAGE_TRANSITION_TYPED, std::string());
 
   UnsafeResource resource;
-  InitResource(&resource, true, GURL(kMalwareURL));
+  InitResource(&resource, SB_THREAT_TYPE_URL_MALWARE, true, GURL(kThreatURL));
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
 
   std::string serialized = WaitForSerializedReport(
       report.get(), true /* did_proceed*/, 1 /* num_visit */);
 
-  ClientMalwareReportRequest actual;
+  ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
-  ClientMalwareReportRequest expected;
-  expected.set_malware_url(kMalwareURL);
+  ClientSafeBrowsingReportRequest expected;
+  expected.set_type(ClientSafeBrowsingReportRequest::URL_MALWARE);
+  expected.set_url(kThreatURL);
   expected.set_page_url(kLandingURL);
   // Note that the referrer policy is not actually enacted here, since that's
   // done in Blink.
   expected.set_referrer_url(kReferrerURL);
   expected.set_did_proceed(true);
   expected.set_repeat_visit(true);
 
-  ClientMalwareReportRequest::Resource* pb_resource = expected.add_resources();
+  ClientSafeBrowsingReportRequest::Resource* pb_resource =
+      expected.add_resources();
   pb_resource->set_id(0);
   pb_resource->set_url(kLandingURL);
   pb_resource = expected.add_resources();
   pb_resource->set_id(1);
-  pb_resource->set_url(kMalwareURL);
+  pb_resource->set_url(kThreatURL);
   pb_resource = expected.add_resources();
   pb_resource->set_id(2);
   pb_resource->set_url(kReferrerURL);
 
   VerifyResults(actual, expected);
 }
 
-// Tests creating a simple malware report where the subresource has a
-// different original_url.
-TEST_F(ThreatDetailsTest, MalwareSubResourceWithOriginalUrl) {
+// Tests creating a simple threat report of a phishing page where the
+// subresource has a different original_url.
+TEST_F(ThreatDetailsTest, ThreatSubResourceWithOriginalUrl) {
   controller().LoadURL(GURL(kLandingURL), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
 
   UnsafeResource resource;
-  InitResource(&resource, true, GURL(kMalwareURL));
+  InitResource(&resource, SB_THREAT_TYPE_URL_PHISHING, true, GURL(kThreatURL));
   resource.original_url = GURL(kOriginalLandingURL);
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
 
   std::string serialized = WaitForSerializedReport(
       report.get(), false /* did_proceed*/, 1 /* num_visit */);
 
-  ClientMalwareReportRequest actual;
+  ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
-  ClientMalwareReportRequest expected;
-  expected.set_malware_url(kMalwareURL);
+  ClientSafeBrowsingReportRequest expected;
+  expected.set_type(ClientSafeBrowsingReportRequest::URL_PHISHING);
+  expected.set_url(kThreatURL);
   expected.set_page_url(kLandingURL);
   expected.set_referrer_url("");
   expected.set_did_proceed(false);
   expected.set_repeat_visit(true);
 
-  ClientMalwareReportRequest::Resource* pb_resource = expected.add_resources();
+  ClientSafeBrowsingReportRequest::Resource* pb_resource =
+      expected.add_resources();
   pb_resource->set_id(0);
   pb_resource->set_url(kLandingURL);
 
   pb_resource = expected.add_resources();
   pb_resource->set_id(1);
   pb_resource->set_url(kOriginalLandingURL);
 
   pb_resource = expected.add_resources();
   pb_resource->set_id(2);
-  pb_resource->set_url(kMalwareURL);
-  // The Resource for kMalwareUrl should have the Resource for
+  pb_resource->set_url(kThreatURL);
+  // The Resource for kThreatURL should have the Resource for
   // kOriginalLandingURL (with id 1) as parent.
   pb_resource->set_parent_id(1);
 
   VerifyResults(actual, expected);
 }
 
-// Tests creating a malware report with data from the renderer.
-TEST_F(ThreatDetailsTest, MalwareDOMDetails) {
+// Tests creating a threat report of a UwS page with data from the renderer.
+TEST_F(ThreatDetailsTest, ThreatDOMDetails) {
   controller().LoadURL(GURL(kLandingURL), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
 
   UnsafeResource resource;
-  InitResource(&resource, true, GURL(kMalwareURL));
+  InitResource(&resource, SB_THREAT_TYPE_URL_UNWANTED, true, GURL(kThreatURL));
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
 
   // Send a message from the DOM, with 2 nodes, a parent and a child.
-  std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
-  SafeBrowsingHostMsg_MalwareDOMDetails_Node child_node;
+  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);
   params.push_back(child_node);
-  SafeBrowsingHostMsg_MalwareDOMDetails_Node parent_node;
+  SafeBrowsingHostMsg_ThreatDOMDetails_Node parent_node;
   parent_node.url = GURL(kDOMParentURL);
   parent_node.children.push_back(GURL(kDOMChildURL));
   params.push_back(parent_node);
   report->OnReceivedThreatDOMDetails(params);
 
   std::string serialized = WaitForSerializedReport(
       report.get(), false /* did_proceed*/, 0 /* num_visit */);
-  ClientMalwareReportRequest actual;
+  ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
-  ClientMalwareReportRequest expected;
-  expected.set_malware_url(kMalwareURL);
+  ClientSafeBrowsingReportRequest expected;
+  expected.set_type(ClientSafeBrowsingReportRequest::URL_UNWANTED);
+  expected.set_url(kThreatURL);
   expected.set_page_url(kLandingURL);
   expected.set_referrer_url("");
   expected.set_did_proceed(false);
   expected.set_repeat_visit(false);
 
-  ClientMalwareReportRequest::Resource* pb_resource = expected.add_resources();
+  ClientSafeBrowsingReportRequest::Resource* pb_resource =
+      expected.add_resources();
   pb_resource->set_id(0);
   pb_resource->set_url(kLandingURL);
 
   pb_resource = expected.add_resources();
   pb_resource->set_id(1);
-  pb_resource->set_url(kMalwareURL);
+  pb_resource->set_url(kThreatURL);
 
   pb_resource = expected.add_resources();
   pb_resource->set_id(2);
   pb_resource->set_url(kDOMChildURL);
   pb_resource->set_parent_id(3);
 
   pb_resource = expected.add_resources();
   pb_resource->set_id(3);
   pb_resource->set_url(kDOMParentURL);
   pb_resource->add_child_ids(2);
   expected.set_complete(false);  // Since the cache was missing.
 
   VerifyResults(actual, expected);
 }
 
-// Tests creating a malware report where there are redirect urls to an unsafe
-// resource url
-TEST_F(ThreatDetailsTest, MalwareWithRedirectUrl) {
+// Tests creating a threat report of a malware page where there are redirect
+// urls to an unsafe resource url.
+TEST_F(ThreatDetailsTest, ThreatWithRedirectUrl) {
   controller().LoadURL(GURL(kLandingURL), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
 
   UnsafeResource resource;
-  InitResource(&resource, true, GURL(kMalwareURL));
+  InitResource(&resource, SB_THREAT_TYPE_URL_MALWARE, true, 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(kMalwareURL));
+  resource.redirect_urls.push_back(GURL(kThreatURL));
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
 
   std::string serialized = WaitForSerializedReport(
       report.get(), true /* did_proceed*/, 0 /* num_visit */);
-  ClientMalwareReportRequest actual;
+  ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
-  ClientMalwareReportRequest expected;
-  expected.set_malware_url(kMalwareURL);
+  ClientSafeBrowsingReportRequest expected;
+  expected.set_type(ClientSafeBrowsingReportRequest::URL_MALWARE);
+  expected.set_url(kThreatURL);
   expected.set_page_url(kLandingURL);
   expected.set_referrer_url("");
   expected.set_did_proceed(true);
   expected.set_repeat_visit(false);
 
-  ClientMalwareReportRequest::Resource* pb_resource = expected.add_resources();
+  ClientSafeBrowsingReportRequest::Resource* pb_resource =
+      expected.add_resources();
   pb_resource->set_id(0);
   pb_resource->set_url(kLandingURL);
 
   pb_resource = expected.add_resources();
   pb_resource->set_id(1);
   pb_resource->set_url(kOriginalLandingURL);
 
   pb_resource = expected.add_resources();
   pb_resource->set_id(2);
-  pb_resource->set_url(kMalwareURL);
+  pb_resource->set_url(kThreatURL);
   pb_resource->set_parent_id(4);
 
   pb_resource = expected.add_resources();
   pb_resource->set_id(3);
   pb_resource->set_url(kFirstRedirectURL);
   pb_resource->set_parent_id(1);
 
   pb_resource = expected.add_resources();
   pb_resource->set_id(4);
   pb_resource->set_url(kSecondRedirectURL);
   pb_resource->set_parent_id(3);
 
   VerifyResults(actual, expected);
 }
 
 // Tests the interaction with the HTTP cache.
 TEST_F(ThreatDetailsTest, HTTPCache) {
   controller().LoadURL(GURL(kLandingURL), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
 
   UnsafeResource resource;
-  InitResource(&resource, true, GURL(kMalwareURL));
+  InitResource(&resource, SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL, true,
+               GURL(kThreatURL));
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource,
                             profile()->GetRequestContext());
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&FillCache,
                  make_scoped_refptr(profile()->GetRequestContext())));
 
   // The cache collection starts after the IPC from the DOM is fired.
-  std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
+  std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
   report->OnReceivedThreatDOMDetails(params);
 
   // Let the cache callbacks complete.
   base::RunLoop().RunUntilIdle();
 
   DVLOG(1) << "Getting serialized report";
   std::string serialized = WaitForSerializedReport(
       report.get(), true /* did_proceed*/, -1 /* num_visit */);
-  ClientMalwareReportRequest actual;
+  ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
-  ClientMalwareReportRequest expected;
-  expected.set_malware_url(kMalwareURL);
+  ClientSafeBrowsingReportRequest expected;
+  expected.set_type(ClientSafeBrowsingReportRequest::CLIENT_SIDE_PHISHING_URL);
+  expected.set_url(kThreatURL);
   expected.set_page_url(kLandingURL);
   expected.set_referrer_url("");
   expected.set_did_proceed(true);
 
-  ClientMalwareReportRequest::Resource* pb_resource = expected.add_resources();
+  ClientSafeBrowsingReportRequest::Resource* pb_resource =
+      expected.add_resources();
   pb_resource->set_id(0);
   pb_resource->set_url(kLandingURL);
-  safe_browsing::ClientMalwareReportRequest::HTTPResponse* pb_response =
+  safe_browsing::ClientSafeBrowsingReportRequest::HTTPResponse* pb_response =
       pb_resource->mutable_response();
   pb_response->mutable_firstline()->set_code(200);
-  safe_browsing::ClientMalwareReportRequest::HTTPHeader* pb_header =
+  safe_browsing::ClientSafeBrowsingReportRequest::HTTPHeader* pb_header =
       pb_response->add_headers();
   pb_header->set_name("Content-Type");
   pb_header->set_value("text/html");
   pb_header = pb_response->add_headers();
   pb_header->set_name("Content-Length");
   pb_header->set_value("1024");
   pb_header = pb_response->add_headers();
   pb_header->set_name("Set-Cookie");
   pb_header->set_value("");  // The cookie is dropped.
   pb_response->set_body(kLandingData);
-  pb_response->set_bodylength(47);
-  pb_response->set_bodydigest("5abb4e63d806ec2c16a40b2699700554");
+  std::string landing_data(kLandingData);
+  pb_response->set_bodylength(landing_data.size());
+  pb_response->set_bodydigest(base::MD5String(landing_data));
   pb_response->set_remote_ip("1.2.3.4:80");
 
   pb_resource = expected.add_resources();
   pb_resource->set_id(1);
-  pb_resource->set_url(kMalwareURL);
+  pb_resource->set_url(kThreatURL);
   pb_response = pb_resource->mutable_response();
   pb_response->mutable_firstline()->set_code(200);
   pb_header = pb_response->add_headers();
   pb_header->set_name("Content-Type");
   pb_header->set_value("image/jpeg");
-  pb_response->set_body(kMalwareData);
-  pb_response->set_bodylength(10);
-  pb_response->set_bodydigest("581373551c43d4cf33bfb3b26838ff95");
+  pb_response->set_body(kThreatData);
+  std::string threat_data(kThreatData);
+  pb_response->set_bodylength(threat_data.size());
+  pb_response->set_bodydigest(base::MD5String(threat_data));
   pb_response->set_remote_ip("1.2.3.4:80");
   expected.set_complete(true);
 
   VerifyResults(actual, expected);
 }
 
 // Tests the interaction with the HTTP cache (where the cache is empty).
 TEST_F(ThreatDetailsTest, HTTPCacheNoEntries) {
   controller().LoadURL(GURL(kLandingURL), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
 
   UnsafeResource resource;
-  InitResource(&resource, true, GURL(kMalwareURL));
+  InitResource(&resource, SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL, true,
+               GURL(kThreatURL));
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource,
                             profile()->GetRequestContext());
 
   // No call to FillCache
 
   // The cache collection starts after the IPC from the DOM is fired.
-  std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
+  std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
   report->OnReceivedThreatDOMDetails(params);
 
   // Let the cache callbacks complete.
   base::RunLoop().RunUntilIdle();
 
   DVLOG(1) << "Getting serialized report";
   std::string serialized = WaitForSerializedReport(
       report.get(), false /* did_proceed*/, -1 /* num_visit */);
-  ClientMalwareReportRequest actual;
+  ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
-  ClientMalwareReportRequest expected;
-  expected.set_malware_url(kMalwareURL);
+  ClientSafeBrowsingReportRequest expected;
+  expected.set_type(ClientSafeBrowsingReportRequest::CLIENT_SIDE_MALWARE_URL);
+  expected.set_url(kThreatURL);
   expected.set_page_url(kLandingURL);
   expected.set_referrer_url("");
   expected.set_did_proceed(false);
 
-  ClientMalwareReportRequest::Resource* pb_resource = expected.add_resources();
+  ClientSafeBrowsingReportRequest::Resource* pb_resource =
+      expected.add_resources();
   pb_resource->set_id(0);
   pb_resource->set_url(kLandingURL);
   pb_resource = expected.add_resources();
   pb_resource->set_id(1);
-  pb_resource->set_url(kMalwareURL);
+  pb_resource->set_url(kThreatURL);
   expected.set_complete(true);
 
   VerifyResults(actual, expected);
 }
 
 // Test getting redirects from history service.
 TEST_F(ThreatDetailsTest, HistoryServiceUrls) {
   // Add content to history service.
   // There are two redirect urls before reacing malware url:
-  // kFirstRedirectURL -> kSecondRedirectURL -> kMalwareURL
-  GURL baseurl(kMalwareURL);
+  // kFirstRedirectURL -> kSecondRedirectURL -> kThreatURL
+  GURL baseurl(kThreatURL);
   history::RedirectList redirects;
   redirects.push_back(GURL(kFirstRedirectURL));
   redirects.push_back(GURL(kSecondRedirectURL));
   AddPageToHistory(baseurl, &redirects);
   // Wait for history service operation finished.
   profile()->BlockUntilHistoryProcessesPendingRequests();
 
   controller().LoadURL(GURL(kLandingURL), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
 
   UnsafeResource resource;
-  InitResource(&resource, true, GURL(kMalwareURL));
+  InitResource(&resource, SB_THREAT_TYPE_URL_MALWARE, true, GURL(kThreatURL));
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
 
   // The redirects collection starts after the IPC from the DOM is fired.
-  std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
+  std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
   report->OnReceivedThreatDOMDetails(params);
 
   // Let the redirects callbacks complete.
   base::RunLoop().RunUntilIdle();
 
   std::string serialized = WaitForSerializedReport(
       report.get(), true /* did_proceed*/, 1 /* num_visit */);
-  ClientMalwareReportRequest actual;
+  ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
-  ClientMalwareReportRequest expected;
-  expected.set_malware_url(kMalwareURL);
+  ClientSafeBrowsingReportRequest expected;
+  expected.set_type(ClientSafeBrowsingReportRequest::URL_MALWARE);
+  expected.set_url(kThreatURL);
   expected.set_page_url(kLandingURL);
   expected.set_referrer_url("");
   expected.set_did_proceed(true);
   expected.set_repeat_visit(true);
 
-  ClientMalwareReportRequest::Resource* pb_resource = expected.add_resources();
+  ClientSafeBrowsingReportRequest::Resource* pb_resource =
+      expected.add_resources();
   pb_resource->set_id(0);
   pb_resource->set_url(kLandingURL);
   pb_resource = expected.add_resources();
   pb_resource->set_id(1);
   pb_resource->set_parent_id(2);
-  pb_resource->set_url(kMalwareURL);
+  pb_resource->set_url(kThreatURL);
   pb_resource = expected.add_resources();
   pb_resource->set_id(2);
   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);
 }