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

Unified Diff: chrome/browser/sync_file_system/local/local_file_sync_context_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
Index: chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc b/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc
index 3484ef793bf3d409c8ae8599bbb6f9c1dd3b3f9f..54e7e17f6f873ec429d533d85091027afab896e8 100644
--- a/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc
+++ b/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc
@@ -410,7 +410,7 @@ TEST_F(LocalFileSyncContextTest, InitializeFileSystemContext) {
FileSystemURLSet urls;
file_system.GetChangedURLsInTracker(&urls);
ASSERT_EQ(1U, urls.size());
- EXPECT_TRUE(ContainsKey(urls, kURL));
+ EXPECT_TRUE(base::ContainsKey(urls, kURL));
// Finishing the test.
sync_context_->ShutdownOnUIThread();
@@ -452,7 +452,7 @@ TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) {
FileSystemURLSet urls;
file_system1.GetChangedURLsInTracker(&urls);
ASSERT_EQ(1U, urls.size());
- EXPECT_TRUE(ContainsKey(urls, kURL1));
+ EXPECT_TRUE(base::ContainsKey(urls, kURL1));
// file_system1's tracker must have no change.
urls.clear();
@@ -466,13 +466,13 @@ TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) {
urls.clear();
file_system1.GetChangedURLsInTracker(&urls);
ASSERT_EQ(1U, urls.size());
- EXPECT_TRUE(ContainsKey(urls, kURL1));
+ EXPECT_TRUE(base::ContainsKey(urls, kURL1));
// file_system2's tracker now must have the change for kURL2.
urls.clear();
file_system2.GetChangedURLsInTracker(&urls);
ASSERT_EQ(1U, urls.size());
- EXPECT_TRUE(ContainsKey(urls, kURL2));
+ EXPECT_TRUE(base::ContainsKey(urls, kURL2));
SyncFileMetadata metadata;
FileChangeList changes;
@@ -632,9 +632,9 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForDeletion) {
FileSystemURLSet urls;
file_system.GetChangedURLsInTracker(&urls);
ASSERT_EQ(3U, urls.size());
- ASSERT_TRUE(ContainsKey(urls, kFile));
- ASSERT_TRUE(ContainsKey(urls, kDir));
- ASSERT_TRUE(ContainsKey(urls, kChild));
+ ASSERT_TRUE(base::ContainsKey(urls, kFile));
+ ASSERT_TRUE(base::ContainsKey(urls, kDir));
+ ASSERT_TRUE(base::ContainsKey(urls, kChild));
for (FileSystemURLSet::iterator iter = urls.begin();
iter != urls.end(); ++iter) {
file_system.ClearChangeForURLInTracker(*iter);
@@ -794,7 +794,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate) {
FileSystemURLSet urls;
file_system.GetChangedURLsInTracker(&urls);
ASSERT_EQ(1U, urls.size());
- EXPECT_TRUE(ContainsKey(urls, kFile1));
+ EXPECT_TRUE(base::ContainsKey(urls, kFile1));
file_system.ClearChangeForURLInTracker(*urls.begin());
// Prepare temporary files which represent the remote file data.

Powered by Google App Engine
This is Rietveld 408576698