Remove last safebrowsing references from content.

BUG=77089
Review URL: http://codereview.chromium.org/7108003

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

1 files changed, 10 insertions, 10 deletions

diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc
index 2defb7a..43c346e 100644
--- a/chrome/browser/safe_browsing/malware_details_unittest.cc
+++ b/chrome/browser/safe_browsing/malware_details_unittest.cc
@@ -211,11 +211,11 @@ class MalwareDetailsTest : public RenderViewHostTestHarness {
 
  protected:
   void InitResource(SafeBrowsingService::UnsafeResource* resource,
-                    ResourceType::Type resource_type,
+                    bool is_subresource,
                     const GURL& url) {
     resource->client = NULL;
     resource->url = url;
-    resource->resource_type = resource_type;
+    resource->is_subresource = is_subresource;
     resource->threat_type = SafeBrowsingService::URL_MALWARE;
     resource->render_process_host_id = contents()->GetRenderProcessHost()->id();
     resource->render_view_id = contents()->render_view_host()->routing_id();
@@ -314,7 +314,7 @@ TEST_F(MalwareDetailsTest, MalwareSubResource) {
   controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED);
 
   SafeBrowsingService::UnsafeResource resource;
-  InitResource(&resource, ResourceType::SUB_RESOURCE, GURL(kMalwareURL));
+  InitResource(&resource, true, GURL(kMalwareURL));
 
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       sb_service_, contents(), resource, NULL);
@@ -345,7 +345,7 @@ TEST_F(MalwareDetailsTest, MalwareSubResourceWithOriginalUrl) {
   controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED);
 
   SafeBrowsingService::UnsafeResource resource;
-  InitResource(&resource, ResourceType::SUB_RESOURCE, GURL(kMalwareURL));
+  InitResource(&resource, true, GURL(kMalwareURL));
   resource.original_url = GURL(kOriginalLandingURL);
 
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
@@ -384,7 +384,7 @@ TEST_F(MalwareDetailsTest, MalwareDOMDetails) {
   controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED);
 
   SafeBrowsingService::UnsafeResource resource;
-  InitResource(&resource, ResourceType::SUB_RESOURCE, GURL(kMalwareURL));
+  InitResource(&resource, true, GURL(kMalwareURL));
 
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       sb_service_.get(), contents(), resource, NULL);
@@ -439,7 +439,7 @@ TEST_F(MalwareDetailsTest, MalwareDOMDetails) {
 TEST_F(MalwareDetailsTest, NotPublicUrl) {
   controller().LoadURL(GURL(kHttpsURL), GURL(), PageTransition::TYPED);
   SafeBrowsingService::UnsafeResource resource;
-  InitResource(&resource, ResourceType::SUB_RESOURCE, GURL(kMalwareURL));
+  InitResource(&resource, true, GURL(kMalwareURL));
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       sb_service_.get(), contents(), resource, NULL);
 
@@ -463,7 +463,7 @@ TEST_F(MalwareDetailsTest, MalwareWithRedirectUrl) {
   controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED);
 
   SafeBrowsingService::UnsafeResource resource;
-  InitResource(&resource, ResourceType::SUB_RESOURCE, GURL(kMalwareURL));
+  InitResource(&resource, true, GURL(kMalwareURL));
   resource.original_url = GURL(kOriginalLandingURL);
 
   // add some redirect urls
@@ -514,7 +514,7 @@ TEST_F(MalwareDetailsTest, HTTPCache) {
   controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED);
 
   SafeBrowsingService::UnsafeResource resource;
-  InitResource(&resource, ResourceType::SUB_RESOURCE, GURL(kMalwareURL));
+  InitResource(&resource, true, GURL(kMalwareURL));
 
   profile()->CreateRequestContext();
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
@@ -587,7 +587,7 @@ TEST_F(MalwareDetailsTest, HTTPCacheNoEntries) {
   controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED);
 
   SafeBrowsingService::UnsafeResource resource;
-  InitResource(&resource, ResourceType::SUB_RESOURCE, GURL(kMalwareURL));
+  InitResource(&resource, true, GURL(kMalwareURL));
 
   profile()->CreateRequestContext();
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
@@ -640,7 +640,7 @@ TEST_F(MalwareDetailsTest, HistoryServiceUrls) {
   controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED);
 
   SafeBrowsingService::UnsafeResource resource;
-  InitResource(&resource, ResourceType::SUB_RESOURCE, GURL(kMalwareURL));
+  InitResource(&resource, true, GURL(kMalwareURL));
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       sb_service_.get(), contents(), resource, NULL);