Index: chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc |
diff --git a/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc b/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc |
index 829cc0fc97463867ce1acbcb29c560e5eb449a06..fb2964d88fcb39c3be69b955e51f03178e573252 100644 |
--- a/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc |
+++ b/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc |
@@ -178,14 +178,14 @@ TEST_F(LocalFileChangeTrackerTest, GetChanges) { |
file_system_.GetChangedURLsInTracker(&urls); |
EXPECT_EQ(5U, urls.size()); |
- EXPECT_TRUE(ContainsKey(urls, URL(kPath1))); |
- EXPECT_TRUE(ContainsKey(urls, URL(kPath2))); |
- EXPECT_TRUE(ContainsKey(urls, URL(kPath3))); |
- EXPECT_TRUE(ContainsKey(urls, URL(kPath4))); |
- EXPECT_TRUE(ContainsKey(urls, URL(kPath5))); |
+ EXPECT_TRUE(base::ContainsKey(urls, URL(kPath1))); |
+ EXPECT_TRUE(base::ContainsKey(urls, URL(kPath2))); |
+ EXPECT_TRUE(base::ContainsKey(urls, URL(kPath3))); |
+ EXPECT_TRUE(base::ContainsKey(urls, URL(kPath4))); |
+ EXPECT_TRUE(base::ContainsKey(urls, URL(kPath5))); |
// Changes for kPath0 must have been offset and removed. |
- EXPECT_FALSE(ContainsKey(urls, URL(kPath0))); |
+ EXPECT_FALSE(base::ContainsKey(urls, URL(kPath0))); |
// GetNextChangedURLs only returns up to max_urls (i.e. 3) urls. |
std::deque<FileSystemURL> urls_to_process; |
@@ -670,8 +670,8 @@ TEST_F(LocalFileChangeTrackerTest, NextChangedURLsWithRecursiveRemove) { |
ASSERT_EQ(2U, urls.size()); |
// The exact order of recursive removal cannot be determined. |
- EXPECT_TRUE(ContainsKey(urls, URL(kPath1))); |
- EXPECT_TRUE(ContainsKey(urls, URL(kPath2))); |
+ EXPECT_TRUE(base::ContainsKey(urls, URL(kPath1))); |
+ EXPECT_TRUE(base::ContainsKey(urls, URL(kPath2))); |
} |
TEST_F(LocalFileChangeTrackerTest, ResetForFileSystem) { |
@@ -694,10 +694,10 @@ TEST_F(LocalFileChangeTrackerTest, ResetForFileSystem) { |
FileSystemURLSet urls; |
GetAllChangedURLs(&urls); |
EXPECT_EQ(4u, urls.size()); |
- EXPECT_TRUE(ContainsKey(urls, URL(kPath0))); |
- EXPECT_TRUE(ContainsKey(urls, URL(kPath1))); |
- EXPECT_TRUE(ContainsKey(urls, URL(kPath2))); |
- EXPECT_TRUE(ContainsKey(urls, URL(kPath3))); |
+ EXPECT_TRUE(base::ContainsKey(urls, URL(kPath0))); |
+ EXPECT_TRUE(base::ContainsKey(urls, URL(kPath1))); |
+ EXPECT_TRUE(base::ContainsKey(urls, URL(kPath2))); |
+ EXPECT_TRUE(base::ContainsKey(urls, URL(kPath3))); |
// Reset all changes for the file system. |
change_tracker()->ResetForFileSystem( |