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

Unified Diff: chrome/browser/browsing_data/browsing_data_file_system_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/browsing_data/browsing_data_cookie_helper.cc ('k') | chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc

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

index 14f430e825298ecc89c81e0178fb1620995e1d9e..4455b7126940c390932b05878d6355b0c53d30e0 100644

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

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

@@ -214,21 +214,21 @@ TEST_F(BrowsingDataFileSystemHelperTest, FetchData) {

if (info.origin == kOrigin1) {

EXPECT_FALSE(test_hosts_found[0]);

test_hosts_found[0] = true;

- EXPECT_FALSE(ContainsKey(info.usage_map, kPersistent));

- EXPECT_TRUE(ContainsKey(info.usage_map, kTemporary));

+ EXPECT_FALSE(base::ContainsKey(info.usage_map, kPersistent));

+ EXPECT_TRUE(base::ContainsKey(info.usage_map, kTemporary));

EXPECT_EQ(kEmptyFileSystemSize,

info.usage_map.at(storage::kFileSystemTypeTemporary));

} else if (info.origin == kOrigin2) {

EXPECT_FALSE(test_hosts_found[1]);

test_hosts_found[1] = true;

- EXPECT_TRUE(ContainsKey(info.usage_map, kPersistent));

- EXPECT_FALSE(ContainsKey(info.usage_map, kTemporary));

+ EXPECT_TRUE(base::ContainsKey(info.usage_map, kPersistent));

+ EXPECT_FALSE(base::ContainsKey(info.usage_map, kTemporary));

EXPECT_EQ(kEmptyFileSystemSize, info.usage_map.at(kPersistent));

} else if (info.origin == kOrigin3) {

EXPECT_FALSE(test_hosts_found[2]);

test_hosts_found[2] = true;

- EXPECT_TRUE(ContainsKey(info.usage_map, kPersistent));

- EXPECT_TRUE(ContainsKey(info.usage_map, kTemporary));

+ EXPECT_TRUE(base::ContainsKey(info.usage_map, kPersistent));

+ EXPECT_TRUE(base::ContainsKey(info.usage_map, kTemporary));

EXPECT_EQ(kEmptyFileSystemSize, info.usage_map.at(kPersistent));

EXPECT_EQ(kEmptyFileSystemSize, info.usage_map.at(kTemporary));

} else {

@@ -254,8 +254,8 @@ TEST_F(BrowsingDataFileSystemHelperTest, DeleteData) {

BrowsingDataFileSystemHelper::FileSystemInfo info =

*(file_system_info_list_->begin());

EXPECT_EQ(kOrigin3, info.origin);

- EXPECT_TRUE(ContainsKey(info.usage_map, kPersistent));

- EXPECT_TRUE(ContainsKey(info.usage_map, kTemporary));

+ EXPECT_TRUE(base::ContainsKey(info.usage_map, kPersistent));

+ EXPECT_TRUE(base::ContainsKey(info.usage_map, kTemporary));

EXPECT_EQ(kEmptyFileSystemSize, info.usage_map[kPersistent]);

EXPECT_EQ(kEmptyFileSystemSize, info.usage_map[kTemporary]);

}

@@ -282,14 +282,14 @@ TEST_F(BrowsingDataFileSystemHelperTest, CannedAddFileSystem) {

std::list<BrowsingDataFileSystemHelper::FileSystemInfo>::iterator info =

file_system_info_list_->begin();

EXPECT_EQ(kOrigin1, info->origin);

- EXPECT_TRUE(ContainsKey(info->usage_map, kPersistent));

- EXPECT_FALSE(ContainsKey(info->usage_map, kTemporary));

+ EXPECT_TRUE(base::ContainsKey(info->usage_map, kPersistent));

+ EXPECT_FALSE(base::ContainsKey(info->usage_map, kTemporary));

EXPECT_EQ(200, info->usage_map[kPersistent]);

info++;

EXPECT_EQ(kOrigin2, info->origin);

- EXPECT_FALSE(ContainsKey(info->usage_map, kPersistent));

- EXPECT_TRUE(ContainsKey(info->usage_map, kTemporary));

+ EXPECT_FALSE(base::ContainsKey(info->usage_map, kPersistent));

+ EXPECT_TRUE(base::ContainsKey(info->usage_map, kTemporary));

EXPECT_EQ(100, info->usage_map[kTemporary]);

}