summaryrefslogtreecommitdiffstats
path: root/chromium/ui/message_center/views/message_popup_collection_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ui/message_center/views/message_popup_collection_unittest.cc')
-rw-r--r--chromium/ui/message_center/views/message_popup_collection_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/ui/message_center/views/message_popup_collection_unittest.cc b/chromium/ui/message_center/views/message_popup_collection_unittest.cc
index f763b516743..eacc6807726 100644
--- a/chromium/ui/message_center/views/message_popup_collection_unittest.cc
+++ b/chromium/ui/message_center/views/message_popup_collection_unittest.cc
@@ -87,10 +87,10 @@ class MessagePopupCollectionTest : public views::ViewsTestBase {
scoped_ptr<Notification> notification(
new Notification(NOTIFICATION_TYPE_BASE_FORMAT,
id,
- UTF8ToUTF16("test title"),
- UTF8ToUTF16("test message"),
+ base::UTF8ToUTF16("test title"),
+ base::UTF8ToUTF16("test message"),
gfx::Image(),
- string16() /* display_source */,
+ base::string16() /* display_source */,
NotifierId(),
message_center::RichNotificationData(),
NULL /* delegate */));
@@ -358,7 +358,7 @@ TEST_F(MessagePopupCollectionTest, DetectMouseHover) {
views::WidgetDelegateView* toast1 = GetToast(id1);
EXPECT_TRUE(toast1 != NULL);
- ui::MouseEvent event(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), 0);
+ ui::MouseEvent event(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), 0, 0);
// Test that mouse detection logic works in presence of out-of-order events.
toast0->OnMouseEntered(event);
@@ -393,7 +393,7 @@ TEST_F(MessagePopupCollectionTest, DetectMouseHoverWithUserClose) {
views::WidgetDelegateView* toast1 = GetToast(id1);
ASSERT_TRUE(toast1 != NULL);
- ui::MouseEvent event(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), 0);
+ ui::MouseEvent event(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), 0, 0);
toast1->OnMouseEntered(event);
static_cast<MessageCenterObserver*>(collection())->OnNotificationRemoved(
id1, true);