Prefix string16 with base:: in ui/.

ui/message_center/cocoa/popup_collection_unittest.mm

 // Copyright (c) 2013 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.
 
 #import "ui/message_center/cocoa/popup_collection.h"
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 38 matching lines @@
 
   void AddThreeNotifications() {
     scoped_ptr<message_center::Notification> notification;
     notification.reset(new message_center::Notification(
         message_center::NOTIFICATION_TYPE_SIMPLE,
         "1",
         ASCIIToUTF16("One"),
         ASCIIToUTF16("This is the first notification to"
                      " be displayed"),
         gfx::Image(),
-        string16(),
+        base::string16(),
         DummyNotifierId(),
         message_center::RichNotificationData(),
         NULL));
     center_->AddNotification(notification.Pass());
 
     notification.reset(new message_center::Notification(
         message_center::NOTIFICATION_TYPE_SIMPLE,
         "2",
         ASCIIToUTF16("Two"),
         ASCIIToUTF16("This is the second notification."),
         gfx::Image(),
-        string16(),
+        base::string16(),
         DummyNotifierId(),
         message_center::RichNotificationData(),
         NULL));
     center_->AddNotification(notification.Pass());
 
     notification.reset(new message_center::Notification(
         message_center::NOTIFICATION_TYPE_SIMPLE,
         "3",
         ASCIIToUTF16("Three"),
         ASCIIToUTF16("This is the third notification "
                      "that has a much longer body "
                      "than the other notifications. It "
                      "may not fit on the screen if we "
                      "set the screen size too small or "
                      "if the notification is way too big"),
         gfx::Image(),
-        string16(),
+        base::string16(),
         DummyNotifierId(),
         message_center::RichNotificationData(),
         NULL));
     center_->AddNotification(notification.Pass());
     WaitForAnimationEnded();
   }
 
   bool CheckSpacingBetween(MCPopupController* upper, MCPopupController* lower) {
     CGFloat minY = NSMinY([[upper window] frame]);
     CGFloat maxY = NSMaxY([[lower window] frame]);
@@ skipping 34 matching lines @@
   EXPECT_EQ(2u, [[collection_ popups] count]);  // "3" does not fit on screen.
 
   scoped_ptr<message_center::Notification> notification;
 
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       "4",
       ASCIIToUTF16("Four"),
       ASCIIToUTF16("This is the fourth notification."),
       gfx::Image(),
-      string16(),
+      base::string16(),
       DummyNotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->AddNotification(notification.Pass());
   WaitForAnimationEnded();
 
   // Remove "1" and "3" should fit on screen.
   center_->RemoveNotification("1", true);
   WaitForAnimationEnded();
   ASSERT_EQ(2u, [[collection_ popups] count]);
@@ skipping 28 matching lines @@
   // Set priority so that kMaxVisiblePopupNotifications does not hide it.
   message_center::RichNotificationData optional;
   optional.priority = message_center::HIGH_PRIORITY;
   scoped_ptr<message_center::Notification> notification;
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       "4",
       ASCIIToUTF16("Four"),
       ASCIIToUTF16("This is the fourth notification."),
       gfx::Image(),
-      string16(),
+      base::string16(),
       DummyNotifierId(),
       optional,
       NULL));
   center_->AddNotification(notification.Pass());
   WaitForAnimationEnded();
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:2],
                                   [popups objectAtIndex:3]));
 
   // Remove "2".
   center_->RemoveNotification("2", true);
@@ skipping 17 matching lines @@
 
   EXPECT_EQ(0u, [[collection_ popups] count]);
   scoped_ptr<message_center::Notification> notification;
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       "1",
       ASCIIToUTF16("One"),
       ASCIIToUTF16("This is the first notification to"
               " be displayed"),
       gfx::Image(),
-      string16(),
+      base::string16(),
       DummyNotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->AddNotification(notification.Pass());
   WaitForAnimationEnded();
   EXPECT_EQ(1u, [[collection_ popups] count]);
 
   // Now give the notification a longer message so that it no longer fits.
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       "1",
       ASCIIToUTF16("One"),
       ASCIIToUTF16("This is now a very very very very "
               "very very very very very very very "
               "very very very very very very very "
               "very very very very very very very "
               "very very very very very very very "
               "very very very very very very very "
               "very very very very very very very "
               "long notification."),
       gfx::Image(),
-      string16(),
+      base::string16(),
       DummyNotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->UpdateNotification("1", notification.Pass());
   WaitForAnimationEnded();
   EXPECT_EQ(0u, [[collection_ popups] count]);
 }
 
 TEST_F(PopupCollectionTest, UpdateIconAndBody) {
   AddThreeNotifications();
@@ skipping 23 matching lines @@
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       "1",
       ASCIIToUTF16("One is going to get a much longer "
               "title than it previously had."),
       ASCIIToUTF16("This is the first notification to "
               "be displayed, but it will also be "
               "updated to have a significantly "
               "longer body"),
       gfx::Image(),
-      string16(),
+      base::string16(),
       DummyNotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->AddNotification(notification.Pass());
   WaitForAnimationEnded();
   EXPECT_GT(NSHeight([[controller view] frame]), NSHeight(old_frame));
 
   // Test updated spacing.
   EXPECT_EQ(3u, [popups count]);
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:0],
                                   [popups objectAtIndex:1]));
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:1],
                                   [popups objectAtIndex:2]));
   EXPECT_EQ("1", [[popups objectAtIndex:0] notificationID]);
   EXPECT_EQ("2", [[popups objectAtIndex:1] notificationID]);
   EXPECT_EQ("3", [[popups objectAtIndex:2] notificationID]);
 }
 
 TEST_F(PopupCollectionTest, CloseCollectionBeforeNewPopupAnimationEnds) {
   // Add a notification and don't wait for the animation to finish.
   scoped_ptr<message_center::Notification> notification;
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       "1",
       ASCIIToUTF16("One"),
       ASCIIToUTF16("This is the first notification to"
                    " be displayed"),
       gfx::Image(),
-      string16(),
+      base::string16(),
       DummyNotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->AddNotification(notification.Pass());
 
   // Release the popup collection before the animation ends. No crash should
   // be expected.
   collection_.reset();
 }
 
@@ skipping 12 matching lines @@
   AddThreeNotifications();
 
   // Update a notification and don't wait for the animation to finish.
   scoped_ptr<message_center::Notification> notification;
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       "1",
       ASCIIToUTF16("One"),
       ASCIIToUTF16("New message."),
       gfx::Image(),
-      string16(),
+      base::string16(),
       DummyNotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->UpdateNotification("1", notification.Pass());
 
   // Release the popup collection before the animation ends. No crash should
   // be expected.
   collection_.reset();
 }
 
 }  // namespace message_center