Add base:: to string16s in chrome/.

chrome/utility/importer/safari_importer_unittest.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/utility/importer/safari_importer.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 64 matching lines @@
   EXPECT_EQ(it2.last_visit.ToDoubleT(),
       importer->HistoryTimeToEpochTime(@"270598231.4"));
 }
 
 TEST_F(SafariImporterTest, BookmarkImport) {
   // Expected results
   const struct {
     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,
       GURL("http://www.apple.com/"),
       ASCIIToUTF16("Toolbar/"),
       ASCIIToUTF16("Apple")
     },
     {
       true,
       GURL("http://www.yahoo.com/"),
       ASCIIToUTF16("Toolbar/"),
       ASCIIToUTF16("Yahoo!")
     },
     {
       true,
       GURL("http://www.cnn.com/"),
       ASCIIToUTF16("Toolbar/News"),
       ASCIIToUTF16("CNN")
     },
     {
       true,
       GURL("http://www.nytimes.com/"),
       ASCIIToUTF16("Toolbar/News"),
       ASCIIToUTF16("The New York Times")
     },
     {
       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")
     },
   };
 
   scoped_refptr<SafariImporter> importer(GetSafariImporter());
   std::vector<ImportedBookmarkEntry> bookmarks;
   importer->ParseBookmarks(ASCIIToUTF16("Toolbar"), &bookmarks);
   size_t num_bookmarks = bookmarks.size();
   ASSERT_EQ(ARRAYSIZE_UNSAFE(kImportedBookmarksData), num_bookmarks);
 
   for (size_t i = 0; i < num_bookmarks; ++i) {
     ImportedBookmarkEntry& entry = bookmarks[i];
     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) {
       EXPECT_EQ(path[j], entry.path[j]);
     }
 
     EXPECT_EQ(kImportedBookmarksData[i].title, entry.title);
   }
 }
 
@@ skipping 39 matching lines @@
   EXPECT_EQ(items & importer::COOKIES, importer::NONE);
   EXPECT_EQ(items & importer::PASSWORDS, importer::NONE);
   EXPECT_EQ(items & importer::SEARCH_ENGINES, importer::NONE);
   EXPECT_EQ(items & importer::HOME_PAGE, importer::NONE);
 
   // Check that we don't import anything from a bogus library directory.
   base::ScopedTempDir fake_library_dir;
   ASSERT_TRUE(fake_library_dir.CreateUniqueTempDir());
   EXPECT_FALSE(SafariImporterCanImport(fake_library_dir.path(), &items));
 }