Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4661)

Unified Diff: chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

Issue 425653002: content: ResourceType cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index 8e153c39d405377bf5b13b3c16759909c4fecda7..20590b5966bb5f2788c8891815f50ed01b34c09a 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -250,7 +250,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
}
void UpdateIPUrlMap(const std::string& ip, const std::string& host) {
- csd_host_->UpdateIPUrlMap(ip, host, "", "", ResourceType::OBJECT);
+ csd_host_->UpdateIPUrlMap(ip, host, "", "", content::RESOURCE_TYPE_OBJECT);
}
BrowseInfo* GetBrowseInfo() {
@@ -836,7 +836,8 @@ TEST_F(ClientSideDetectionHostTest, UpdateIPUrlMap) {
std::vector<IPUrlInfo> expected_urls;
for (int i = 0; i < 20; i++) {
std::string url = base::StringPrintf("http://%d.com/", i);
- expected_urls.push_back(IPUrlInfo(url, "", "", ResourceType::OBJECT));
+ expected_urls.push_back(
+ IPUrlInfo(url, "", "", content::RESOURCE_TYPE_OBJECT));
UpdateIPUrlMap("250.10.10.10", url);
}
ASSERT_EQ(1U, browse_info->ips.size());
@@ -855,8 +856,8 @@ TEST_F(ClientSideDetectionHostTest, UpdateIPUrlMap) {
for (int i = 0; i < 199; i++) {
std::string ip = base::StringPrintf("%d.%d.%d.256", i, i, i);
expected_urls.clear();
- expected_urls.push_back(IPUrlInfo("test.com/", "", "",
- ResourceType::OBJECT));
+ expected_urls.push_back(
+ IPUrlInfo("test.com/", "", "", content::RESOURCE_TYPE_OBJECT));
UpdateIPUrlMap(ip, "test.com/");
ASSERT_EQ(1U, browse_info->ips[ip].size());
CheckIPUrlEqual(expected_urls,
@@ -874,8 +875,10 @@ TEST_F(ClientSideDetectionHostTest, UpdateIPUrlMap) {
UpdateIPUrlMap("100.100.100.256", "more.com/");
ASSERT_EQ(2U, browse_info->ips["100.100.100.256"].size());
expected_urls.clear();
- expected_urls.push_back(IPUrlInfo("test.com/", "", "", ResourceType::OBJECT));
- expected_urls.push_back(IPUrlInfo("more.com/", "", "", ResourceType::OBJECT));
+ expected_urls.push_back(
+ IPUrlInfo("test.com/", "", "", content::RESOURCE_TYPE_OBJECT));
+ expected_urls.push_back(
+ IPUrlInfo("more.com/", "", "", content::RESOURCE_TYPE_OBJECT));
CheckIPUrlEqual(expected_urls,
browse_info->ips["100.100.100.256"]);
}
« no previous file with comments | « chrome/browser/safe_browsing/client_side_detection_host.cc ('k') | chrome/browser/search/iframe_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698