chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc - Issue 2230203002: chrome: Use stl utilities from the base namespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed accidental components/ change Created 4 years, 4 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

« no previous file with comments | « chrome/browser/background_sync/background_sync_controller_impl.cc ('k') | chrome/browser/browsing_data/browsing_data_cookie_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc

diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc

index ece320a7299630bd2155002d50374abfcc64c19d..f6263502f08c83fc8fc7e67b461b66ccfcbadfdb 100644

--- a/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc

+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc

@@ -75,17 +75,17 @@ TEST_F(CannedBrowsingDataAppCacheHelperTest, SetInfo) {

callback.info_collection()->infos_by_origin;

ASSERT_EQ(2u, collection.size());

- EXPECT_TRUE(ContainsKey(collection, manifest1.GetOrigin()));

+ EXPECT_TRUE(base::ContainsKey(collection, manifest1.GetOrigin()));

ASSERT_EQ(1u, collection[manifest1.GetOrigin()].size());

EXPECT_EQ(manifest1, collection[manifest1.GetOrigin()].at(0).manifest_url);

- EXPECT_TRUE(ContainsKey(collection, manifest2.GetOrigin()));

+ EXPECT_TRUE(base::ContainsKey(collection, manifest2.GetOrigin()));

EXPECT_EQ(2u, collection[manifest2.GetOrigin()].size());

std::set<GURL> manifest_results;

manifest_results.insert(collection[manifest2.GetOrigin()].at(0).manifest_url);

manifest_results.insert(collection[manifest2.GetOrigin()].at(1).manifest_url);

- EXPECT_TRUE(ContainsKey(manifest_results, manifest2));

- EXPECT_TRUE(ContainsKey(manifest_results, manifest3));

+ EXPECT_TRUE(base::ContainsKey(manifest_results, manifest2));

+ EXPECT_TRUE(base::ContainsKey(manifest_results, manifest3));

}

TEST_F(CannedBrowsingDataAppCacheHelperTest, Unique) {

@@ -105,7 +105,7 @@ TEST_F(CannedBrowsingDataAppCacheHelperTest, Unique) {

callback.info_collection()->infos_by_origin;

ASSERT_EQ(1u, collection.size());

- EXPECT_TRUE(ContainsKey(collection, manifest.GetOrigin()));

+ EXPECT_TRUE(base::ContainsKey(collection, manifest.GetOrigin()));

ASSERT_EQ(1u, collection[manifest.GetOrigin()].size());

EXPECT_EQ(manifest, collection[manifest.GetOrigin()].at(0).manifest_url);

}

@@ -139,7 +139,8 @@ TEST_F(CannedBrowsingDataAppCacheHelperTest, Delete) {

EXPECT_EQ(3u, helper->GetAppCacheCount());

helper->DeleteAppCacheGroup(manifest2);

EXPECT_EQ(2u, helper->GetAppCacheCount());

- EXPECT_FALSE(ContainsKey(helper->GetOriginAppCacheInfoMap(), manifest2));

+ EXPECT_FALSE(

+ base::ContainsKey(helper->GetOriginAppCacheInfoMap(), manifest2));

}

TEST_F(CannedBrowsingDataAppCacheHelperTest, IgnoreExtensionsAndDevTools) {