content: ResourceType cleanup.

chrome/browser/safe_browsing/browser_feature_extractor_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 "chrome/browser/safe_browsing/browser_feature_extractor.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 581 matching lines @@
         "http://www.good.com/")));
   EXPECT_DOUBLE_EQ(1.0, features[features::kSafeBrowsingIsSubresource]);
   EXPECT_DOUBLE_EQ(2.0, features[features::kSafeBrowsingThreatType]);
 }
 
 TEST_F(BrowserFeatureExtractorTest, MalwareFeatures) {
   ClientMalwareRequest request;
   request.set_url("http://www.foo.com/");
 
   std::vector<IPUrlInfo> bad_urls;
-  bad_urls.push_back(IPUrlInfo("http://bad.com", "GET", "",
-                               ResourceType::SCRIPT));
-  bad_urls.push_back(IPUrlInfo("http://evil.com", "GET", "",
-                               ResourceType::SCRIPT));
+  bad_urls.push_back(
+      IPUrlInfo("http://bad.com", "GET", "", content::RESOURCE_TYPE_SCRIPT));
+  bad_urls.push_back(
+      IPUrlInfo("http://evil.com", "GET", "", content::RESOURCE_TYPE_SCRIPT));
   browse_info_->ips.insert(std::make_pair("193.5.163.8", bad_urls));
   browse_info_->ips.insert(std::make_pair("92.92.92.92", bad_urls));
   std::vector<IPUrlInfo> good_urls;
-  good_urls.push_back(IPUrlInfo("http://ok.com", "GET", "",
-                                ResourceType::SCRIPT));
+  good_urls.push_back(
+      IPUrlInfo("http://ok.com", "GET", "", content::RESOURCE_TYPE_SCRIPT));
   browse_info_->ips.insert(std::make_pair("23.94.78.1", good_urls));
   EXPECT_CALL(*db_manager_, MatchMalwareIP("193.5.163.8"))
       .WillOnce(Return(true));
   EXPECT_CALL(*db_manager_, MatchMalwareIP("92.92.92.92"))
       .WillOnce(Return(true));
   EXPECT_CALL(*db_manager_, MatchMalwareIP("23.94.78.1"))
       .WillOnce(Return(false));
 
   ExtractMalwareFeatures(&request);
   EXPECT_EQ(4, request.bad_ip_url_info_size());
@@ skipping 11 matching lines @@
   EXPECT_EQ(2U, urls.size());
   EXPECT_TRUE(urls.find("http://bad.com") != urls.end());
   EXPECT_TRUE(urls.find("http://evil.com") != urls.end());
 }
 
 TEST_F(BrowserFeatureExtractorTest, MalwareFeatures_ExceedLimit) {
   ClientMalwareRequest request;
   request.set_url("http://www.foo.com/");
 
   std::vector<IPUrlInfo> bad_urls;
-  bad_urls.push_back(IPUrlInfo("http://bad.com", "GET", "",
-                               ResourceType::SCRIPT));
+  bad_urls.push_back(
+      IPUrlInfo("http://bad.com", "GET", "", content::RESOURCE_TYPE_SCRIPT));
   std::vector<std::string> ips;
   for (int i = 0; i < 7; ++i) {  // Add 7 ips
     std::string ip = base::StringPrintf("%d.%d.%d.%d", i, i, i, i);
     ips.push_back(ip);
     browse_info_->ips.insert(std::make_pair(ip, bad_urls));
 
     // First ip is good but all the others are bad.
     EXPECT_CALL(*db_manager_, MatchMalwareIP(ip)).WillOnce(Return(i > 0));
   }
 
   ExtractMalwareFeatures(&request);
   // The number of IP matched url we store is capped at 5 IPs per request.
   EXPECT_EQ(5, request.bad_ip_url_info_size());
 }
 
 }  // namespace safe_browsing