Replace string16 with base::string16.

chrome/browser/bookmarks/bookmark_html_writer_unittest.cc

 // 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/browser/bookmarks/bookmark_html_writer.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ skipping 39 matching lines @@
 class BookmarkHTMLWriterTest : public testing::Test {
  protected:
   virtual void SetUp() {
     testing::Test::SetUp();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     path_ = temp_dir_.path().AppendASCII("bookmarks.html");
   }
 
   // Converts an ImportedBookmarkEntry to a string suitable for assertion
   // testing.
-  string16 BookmarkEntryToString(const ImportedBookmarkEntry& entry) {
-    string16 result;
+  base::string16 BookmarkEntryToString(const ImportedBookmarkEntry& entry) {
+    base::string16 result;
     result.append(ASCIIToUTF16("on_toolbar="));
     if (entry.in_toolbar)
       result.append(ASCIIToUTF16("true"));
     else
       result.append(ASCIIToUTF16("false"));
 
     result.append(ASCIIToUTF16(" url=") + UTF8ToUTF16(entry.url.spec()));
 
     result.append(ASCIIToUTF16(" path="));
     for (size_t i = 0; i < entry.path.size(); ++i) {
       if (i != 0)
         result.append(ASCIIToUTF16("/"));
       result.append(entry.path[i]);
     }
 
     result.append(ASCIIToUTF16(" title="));
     result.append(entry.title);
 
     result.append(ASCIIToUTF16(" time="));
     result.append(base::TimeFormatFriendlyDateAndTime(entry.creation_time));
     return result;
   }
 
   // Creates a set of bookmark values to a string for assertion testing.
-  string16 BookmarkValuesToString(bool on_toolbar,
+  base::string16 BookmarkValuesToString(bool on_toolbar,
                                   const GURL& url,
-                                  const string16& title,
+                                  const base::string16& title,
                                   base::Time creation_time,
-                                  const string16& f1,
-                                  const string16& f2,
-                                  const string16& f3) {
+                                  const base::string16& f1,
+                                  const base::string16& f2,
+                                  const base::string16& f3) {
     ImportedBookmarkEntry entry;
     entry.in_toolbar = on_toolbar;
     entry.url = url;
     if (!f1.empty()) {
       entry.path.push_back(f1);
       if (!f2.empty()) {
         entry.path.push_back(f2);
         if (!f3.empty())
           entry.path.push_back(f3);
       }
     }
     entry.title = title;
     entry.creation_time = creation_time;
     return BookmarkEntryToString(entry);
   }
 
   void AssertBookmarkEntryEquals(const ImportedBookmarkEntry& entry,
                                  bool on_toolbar,
                                  const GURL& url,
-                                 const string16& title,
+                                 const base::string16& title,
                                  base::Time creation_time,
-                                 const string16& f1,
-                                 const string16& f2,
-                                 const string16& f3) {
+                                 const base::string16& f1,
+                                 const base::string16& f2,
+                                 const base::string16& f3) {
     EXPECT_EQ(BookmarkValuesToString(on_toolbar, url, title, creation_time,
                                      f1, f2, f3),
               BookmarkEntryToString(entry));
   }
 
   base::ScopedTempDir temp_dir_;
   base::FilePath path_;
 };
 
 // Class that will notify message loop when file is written.
@@ skipping 43 matching lines @@
   //   url4
   // Other
   //   url1
   //   url2
   //   F3
   //     F4
   //       url1
   // Mobile
   //   url1
   //   <bookmark without a title.>
-  string16 f1_title = ASCIIToUTF16("F\"&;<1\"");
-  string16 f2_title = ASCIIToUTF16("F2");
-  string16 f3_title = ASCIIToUTF16("F 3");
-  string16 f4_title = ASCIIToUTF16("F4");
-  string16 url1_title = ASCIIToUTF16("url 1");
-  string16 url2_title = ASCIIToUTF16("url&2");
-  string16 url3_title = ASCIIToUTF16("url\"3");
-  string16 url4_title = ASCIIToUTF16("url\"&;");
-  string16 unnamed_bookmark_title = ASCIIToUTF16("");
+  base::string16 f1_title = ASCIIToUTF16("F\"&;<1\"");
+  base::string16 f2_title = ASCIIToUTF16("F2");
+  base::string16 f3_title = ASCIIToUTF16("F 3");
+  base::string16 f4_title = ASCIIToUTF16("F4");
+  base::string16 url1_title = ASCIIToUTF16("url 1");
+  base::string16 url2_title = ASCIIToUTF16("url&2");
+  base::string16 url3_title = ASCIIToUTF16("url\"3");
+  base::string16 url4_title = ASCIIToUTF16("url\"&;");
+  base::string16 unnamed_bookmark_title = ASCIIToUTF16("");
   GURL url1("http://url1");
   GURL url1_favicon("http://url1/icon.ico");
   GURL url2("http://url2");
   GURL url3("http://url3");
   GURL url4("javascript:alert(\"Hello!\");");
   GURL unnamed_bookmark_url("about:blank");
   base::Time t1(base::Time::Now());
   base::Time t2(t1 + base::TimeDelta::FromHours(1));
   base::Time t3(t1 + base::TimeDelta::FromHours(1));
   base::Time t4(t1 + base::TimeDelta::FromHours(1));
@@ skipping 51 matching lines @@
       std::set<GURL>::const_iterator iter = favicons[i].urls.find(url1);
       ASSERT_TRUE(iter != favicons[i].urls.end());
       ASSERT_TRUE(*iter == url1);
       ASSERT_TRUE(favicons[i].png_data == icon_data);
     }
   }
 
   // Verify we got back what we wrote.
   ASSERT_EQ(9U, parsed_bookmarks.size());
   // Windows and ChromeOS builds use Sentence case.
-  string16 bookmark_folder_name =
+  base::string16 bookmark_folder_name =
       l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_FOLDER_NAME);
   AssertBookmarkEntryEquals(parsed_bookmarks[0], true, url1, url1_title, t1,
-                            bookmark_folder_name, f1_title, string16());
+                            bookmark_folder_name, f1_title, base::string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[1], true, url2, url2_title, t2,
                             bookmark_folder_name, f1_title, f2_title);
   AssertBookmarkEntryEquals(parsed_bookmarks[2], true, url3, url3_title, t3,
-                            bookmark_folder_name, string16(), string16());
+                            bookmark_folder_name, base::string16(),
+                            base::string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[3], true, url4, url4_title, t4,
-                            bookmark_folder_name, string16(), string16());
+                            bookmark_folder_name, base::string16(),
+                            base::string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url1, url1_title, t1,
-                            string16(), string16(), string16());
+                            base::string16(), base::string16(),
+                            base::string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url2, url2_title, t2,
-                            string16(), string16(), string16());
+                            base::string16(), base::string16(),
+                            base::string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1,
-                            f3_title, f4_title, string16());
+                            f3_title, f4_title, base::string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[7], false, url1, url1_title, t1,
-                            string16(), string16(), string16());
+                            base::string16(), base::string16(),
+                            base::string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[8], false, unnamed_bookmark_url,
                             unnamed_bookmark_title, t2,
-                            string16(), string16(), string16());
+                            base::string16(), base::string16(),
+                            base::string16());
 }