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

Unified Diff: chrome/utility/importer/safari_importer_unittest.mm

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years 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/utility/importer/safari_importer.mm ('k') | chrome/utility/media_galleries/itunes_library_parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/importer/safari_importer_unittest.mm
diff --git a/chrome/utility/importer/safari_importer_unittest.mm b/chrome/utility/importer/safari_importer_unittest.mm
index d6c93e20ddc6ec4d8de87bc4fb2d2e054a4df9a3..d7f3c65b09fd85edb1259ea3f63bde7ec08c8dda 100644
--- a/chrome/utility/importer/safari_importer_unittest.mm
+++ b/chrome/utility/importer/safari_importer_unittest.mm
@@ -82,8 +82,8 @@ TEST_F(SafariImporterTest, BookmarkImport) {
bool in_toolbar;
GURL url;
// We store the path with levels of nesting delimited by forward slashes.
- string16 path;
- string16 title;
+ base::string16 path;
+ base::string16 title;
} kImportedBookmarksData[] = {
{
true,
@@ -112,19 +112,19 @@ TEST_F(SafariImporterTest, BookmarkImport) {
{
false,
GURL("http://www.reddit.com/"),
- string16(),
+ base::string16(),
ASCIIToUTF16("reddit.com: what's new online!")
},
{
false,
GURL(),
- string16(),
+ base::string16(),
ASCIIToUTF16("Empty Folder")
},
{
false,
GURL("http://www.webkit.org/blog/"),
- string16(),
+ base::string16(),
ASCIIToUTF16("Surfin' Safari - The WebKit Blog")
},
};
@@ -140,7 +140,7 @@ TEST_F(SafariImporterTest, BookmarkImport) {
EXPECT_EQ(kImportedBookmarksData[i].in_toolbar, entry.in_toolbar);
EXPECT_EQ(kImportedBookmarksData[i].url, entry.url);
- std::vector<string16> path;
+ std::vector<base::string16> path;
Tokenize(kImportedBookmarksData[i].path, ASCIIToUTF16("/"), &path);
ASSERT_EQ(path.size(), entry.path.size());
for (size_t j = 0; j < path.size(); ++j) {
« no previous file with comments | « chrome/utility/importer/safari_importer.mm ('k') | chrome/utility/media_galleries/itunes_library_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698