Making CSD ReportType enum consistent.

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 1063 matching lines @@
 
   VerifyResults(actual, expected);
 }
 
 // Tests the interaction with the HTTP cache.
 TEST_F(ThreatDetailsTest, HTTPCache) {
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kLandingURL));
 
   UnsafeResource resource;
-  InitResource(&resource, SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL,
+  InitResource(&resource, SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING,
                true /* is_subresource */, GURL(kThreatURL));
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource,
                             profile()->GetRequestContext(), history_service());
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::BindOnce(&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);
 
   // 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 */);
   ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
   ClientSafeBrowsingReportRequest expected;
-  expected.set_type(ClientSafeBrowsingReportRequest::CLIENT_SIDE_PHISHING_URL);
+  expected.set_type(ClientSafeBrowsingReportRequest::URL_CLIENT_SIDE_PHISHING);
   expected.set_url(kThreatURL);
   expected.set_page_url(kLandingURL);
   expected.set_referrer_url("");
   expected.set_did_proceed(true);
 
   ClientSafeBrowsingReportRequest::Resource* pb_resource =
       expected.add_resources();
   pb_resource->set_id(0);
   pb_resource->set_url(kLandingURL);
   ClientSafeBrowsingReportRequest::HTTPResponse* pb_response =
@@ skipping 36 matching lines @@
   VerifyResults(actual, expected);
 }
 
 // Test that only some fields of the HTTPS resource (eg: whitelisted headers)
 // are reported.
 TEST_F(ThreatDetailsTest, HttpsResourceSanitization) {
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kLandingURL));
 
   UnsafeResource resource;
-  InitResource(&resource, SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL,
+  InitResource(&resource, SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING,
                true /* is_subresource */, GURL(kThreatURLHttps));
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource,
                             profile()->GetRequestContext(), history_service());
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::BindOnce(&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);
 
   // 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 */);
   ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
   ClientSafeBrowsingReportRequest expected;
-  expected.set_type(ClientSafeBrowsingReportRequest::CLIENT_SIDE_PHISHING_URL);
+  expected.set_type(ClientSafeBrowsingReportRequest::URL_CLIENT_SIDE_PHISHING);
   expected.set_url(kThreatURLHttps);
   expected.set_page_url(kLandingURL);
   expected.set_referrer_url("");
   expected.set_did_proceed(true);
 
   ClientSafeBrowsingReportRequest::Resource* pb_resource =
       expected.add_resources();
   pb_resource->set_id(0);
   pb_resource->set_url(kLandingURL);
   ClientSafeBrowsingReportRequest::HTTPResponse* pb_response =
@@ skipping 33 matching lines @@
 
   VerifyResults(actual, expected);
 }
 
 // Tests the interaction with the HTTP cache (where the cache is empty).
 TEST_F(ThreatDetailsTest, HTTPCacheNoEntries) {
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kLandingURL));
 
   UnsafeResource resource;
-  InitResource(&resource, SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL,
+  InitResource(&resource, SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE,
                true /* is_subresource */, GURL(kThreatURL));
 
   scoped_refptr<ThreatDetailsWrap> report =
       new ThreatDetailsWrap(ui_manager_.get(), web_contents(), resource,
                             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();
 
   DVLOG(1) << "Getting serialized report";
   std::string serialized = WaitForSerializedReport(
       report.get(), false /* did_proceed*/, -1 /* num_visit */);
   ClientSafeBrowsingReportRequest actual;
   actual.ParseFromString(serialized);
 
   ClientSafeBrowsingReportRequest expected;
-  expected.set_type(ClientSafeBrowsingReportRequest::CLIENT_SIDE_MALWARE_URL);
+  expected.set_type(ClientSafeBrowsingReportRequest::URL_CLIENT_SIDE_MALWARE);
   expected.set_url(kThreatURL);
   expected.set_page_url(kLandingURL);
   expected.set_referrer_url("");
   expected.set_did_proceed(false);
 
   ClientSafeBrowsingReportRequest::Resource* pb_resource =
       expected.add_resources();
   pb_resource->set_id(0);
   pb_resource->set_url(kLandingURL);
   pb_resource = expected.add_resources();
@@ skipping 59 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