Prefix string16 with base:: in ui/.

ui/base/l10n/time_format_unittest.cc

Index: ui/base/l10n/time_format_unittest.cc
diff --git a/ui/base/l10n/time_format_unittest.cc b/ui/base/l10n/time_format_unittest.cc
index eaee957136f0e4c66c52f165289fcc58574376ff..483538fcc1bb76398888fcb657133343ae25fd74 100644
--- a/ui/base/l10n/time_format_unittest.cc
+++ b/ui/base/l10n/time_format_unittest.cc
@@ -16,9 +16,9 @@ namespace {
 using base::TimeDelta;
 
 void TestTimeFormats(const TimeDelta& delta, const char* expected_ascii) {
-  string16 expected = ASCIIToUTF16(expected_ascii);
-  string16 expected_left = expected + ASCIIToUTF16(" left");
-  string16 expected_ago = expected + ASCIIToUTF16(" ago");
+  base::string16 expected = ASCIIToUTF16(expected_ascii);
+  base::string16 expected_left = expected + ASCIIToUTF16(" left");
+  base::string16 expected_ago = expected + ASCIIToUTF16(" ago");
   EXPECT_EQ(expected, TimeFormat::TimeRemainingShort(delta));
   EXPECT_EQ(expected_left, TimeFormat::TimeRemaining(delta));
   EXPECT_EQ(expected_ago, TimeFormat::TimeElapsed(delta));
@@ -53,19 +53,20 @@ TEST(TimeFormat, FormatTime) {
 // crbug.com/159388: This test fails when daylight savings time ends.
 TEST(TimeFormat, RelativeDate) {
   base::Time now = base::Time::Now();
-  string16 today_str = TimeFormat::RelativeDate(now, NULL);
+  base::string16 today_str = TimeFormat::RelativeDate(now, NULL);
   EXPECT_EQ(ASCIIToUTF16("Today"), today_str);
 
   base::Time yesterday = now - TimeDelta::FromDays(1);
-  string16 yesterday_str = TimeFormat::RelativeDate(yesterday, NULL);
+  base::string16 yesterday_str = TimeFormat::RelativeDate(yesterday, NULL);
   EXPECT_EQ(ASCIIToUTF16("Yesterday"), yesterday_str);
 
   base::Time two_days_ago = now - TimeDelta::FromDays(2);
-  string16 two_days_ago_str = TimeFormat::RelativeDate(two_days_ago, NULL);
+  base::string16 two_days_ago_str =
+      TimeFormat::RelativeDate(two_days_ago, NULL);
   EXPECT_TRUE(two_days_ago_str.empty());
 
   base::Time a_week_ago = now - TimeDelta::FromDays(7);
-  string16 a_week_ago_str = TimeFormat::RelativeDate(a_week_ago, NULL);
+  base::string16 a_week_ago_str = TimeFormat::RelativeDate(a_week_ago, NULL);
   EXPECT_TRUE(a_week_ago_str.empty());
 }