Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1017)

Unified Diff: chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc

Issue 6688054: Move geolocation, desktop notification, and device orientation into their own message files. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc
===================================================================
--- chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc (revision 78781)
+++ chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc (working copy)
@@ -8,7 +8,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/common/render_messages_params.h"
+#include "content/common/desktop_notification_messages.h"
namespace chromeos {
@@ -93,9 +93,9 @@
profile_.reset(NULL);
}
-ViewHostMsg_ShowNotification_Params
+DesktopNotificationHostMsg_Show_Params
DesktopNotificationsTest::StandardTestNotification() {
- ViewHostMsg_ShowNotification_Params params;
+ DesktopNotificationHostMsg_Show_Params params;
params.notification_id = 0;
params.origin = GURL("http://www.google.com");
params.is_html = false;
@@ -107,7 +107,7 @@
}
TEST_F(DesktopNotificationsTest, TestShow) {
- ViewHostMsg_ShowNotification_Params params = StandardTestNotification();
+ DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
params.notification_id = 1;
EXPECT_TRUE(service_->ShowDesktopNotification(
params, 0, 0, DesktopNotificationService::PageNotification));
@@ -115,7 +115,7 @@
MessageLoopForUI::current()->RunAllPending();
EXPECT_EQ(1, balloon_collection_->count());
- ViewHostMsg_ShowNotification_Params params2;
+ DesktopNotificationHostMsg_Show_Params params2;
params2.origin = GURL("http://www.google.com");
params2.is_html = true;
params2.contents_url = GURL("http://www.google.com/notification.html");
@@ -132,7 +132,7 @@
}
TEST_F(DesktopNotificationsTest, TestClose) {
- ViewHostMsg_ShowNotification_Params params = StandardTestNotification();
+ DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
params.notification_id = 1;
// Request a notification; should open a balloon.
@@ -161,7 +161,7 @@
int route_id = 0;
int notification_id = 1;
- ViewHostMsg_ShowNotification_Params params = StandardTestNotification();
+ DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
params.notification_id = notification_id;
// Request a notification; should open a balloon.
@@ -192,7 +192,7 @@
const int kLotsOfToasts = 20;
for (int id = 1; id <= kLotsOfToasts; ++id) {
SCOPED_TRACE(base::StringPrintf("Creation loop: id=%d", id));
- ViewHostMsg_ShowNotification_Params params = StandardTestNotification();
+ DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
params.notification_id = id;
EXPECT_TRUE(service_->ShowDesktopNotification(
params, process_id, route_id,
@@ -253,7 +253,7 @@
TEST_F(DesktopNotificationsTest, TestUserInputEscaping) {
// Create a test script with some HTML; assert that it doesn't get into the
// data:// URL that's produced for the balloon.
- ViewHostMsg_ShowNotification_Params params = StandardTestNotification();
+ DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
params.title = ASCIIToUTF16("<script>window.alert('uh oh');</script>");
params.body = ASCIIToUTF16("<i>this text is in italics</i>");
params.notification_id = 1;
« no previous file with comments | « chrome/browser/chromeos/notifications/desktop_notifications_unittest.h ('k') | chrome/browser/desktop_notification_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698