Move the struct used when showing a desktop notification to content/public/common, so that chrome...

chrome/browser/notifications/desktop_notifications_unittest.cc

 // Copyright (c) 2011 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/notifications/desktop_notifications_unittest.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
-#include "content/common/desktop_notification_messages.h"
+#include "content/public/common/show_desktop_notification_params.h"
 
 using content::BrowserThread;
 
 // static
 const int MockBalloonCollection::kMockBalloonSpace = 5;
 
 // static
 std::string DesktopNotificationsTest::log_output_;
 
 MockBalloonCollection::MockBalloonCollection() {}
@@ skipping 69 matching lines @@
   service_.reset(new DesktopNotificationService(profile(), ui_manager_.get()));
   log_output_.clear();
 }
 
 void DesktopNotificationsTest::TearDown() {
   service_.reset(NULL);
   ui_manager_.reset(NULL);
   profile_.reset(NULL);
 }
 
-DesktopNotificationHostMsg_Show_Params
+content::ShowDesktopNotificationHostMsgParams
 DesktopNotificationsTest::StandardTestNotification() {
-  DesktopNotificationHostMsg_Show_Params params;
+  content::ShowDesktopNotificationHostMsgParams params;
   params.notification_id = 0;
   params.origin = GURL("http://www.google.com");
   params.is_html = false;
   params.icon_url = GURL("/icon.png");
   params.title = ASCIIToUTF16("Title");
   params.body = ASCIIToUTF16("Text");
   params.direction = WebKit::WebTextDirectionDefault;
   return params;
 }
 
 TEST_F(DesktopNotificationsTest, TestShow) {
-  DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
+  content::ShowDesktopNotificationHostMsgParams params =
+      StandardTestNotification();
   params.notification_id = 1;
 
   EXPECT_TRUE(service_->ShowDesktopNotification(
       params, 0, 0, DesktopNotificationService::PageNotification));
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(1, balloon_collection_->count());
 
-  DesktopNotificationHostMsg_Show_Params params2;
+  content::ShowDesktopNotificationHostMsgParams params2;
   params2.origin = GURL("http://www.google.com");
   params2.is_html = true;
   params2.contents_url = GURL("http://www.google.com/notification.html");
   params2.notification_id = 2;
 
   EXPECT_TRUE(service_->ShowDesktopNotification(
       params2, 0, 0, DesktopNotificationService::PageNotification));
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(2, balloon_collection_->count());
 
   EXPECT_EQ("notification displayed\n"
             "notification displayed\n",
             log_output_);
 }
 
 TEST_F(DesktopNotificationsTest, TestClose) {
-  DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
+  content::ShowDesktopNotificationHostMsgParams params =
+      StandardTestNotification();
   params.notification_id = 1;
 
   // Request a notification; should open a balloon.
   EXPECT_TRUE(service_->ShowDesktopNotification(
       params, 0, 0, DesktopNotificationService::PageNotification));
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(1, balloon_collection_->count());
 
   // Close all the open balloons.
   while (balloon_collection_->count() > 0) {
     (*(balloon_collection_->GetActiveBalloons().begin()))->OnClose(true);
   }
 
   EXPECT_EQ("notification displayed\n"
             "notification closed by user\n",
             log_output_);
 }
 
 TEST_F(DesktopNotificationsTest, TestCancel) {
   int process_id = 0;
   int route_id = 0;
   int notification_id = 1;
 
-  DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
+  content::ShowDesktopNotificationHostMsgParams params =
+      StandardTestNotification();
   params.notification_id = notification_id;
 
   // Request a notification; should open a balloon.
   EXPECT_TRUE(service_->ShowDesktopNotification(
       params, process_id, route_id,
       DesktopNotificationService::PageNotification));
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(1, balloon_collection_->count());
 
   // Cancel the same notification
   service_->CancelDesktopNotification(process_id,
                                       route_id,
                                       notification_id);
   MessageLoopForUI::current()->RunAllPending();
   // Verify that the balloon collection is now empty.
   EXPECT_EQ(0, balloon_collection_->count());
 
   EXPECT_EQ("notification displayed\n"
             "notification closed by script\n",
             log_output_);
 }
 
 #if defined(OS_WIN) || defined(TOOLKIT_VIEWS)
 TEST_F(DesktopNotificationsTest, TestPositioning) {
-  DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
+  content::ShowDesktopNotificationHostMsgParams params =
+      StandardTestNotification();
   std::string expected_log;
   // Create some toasts.  After each but the first, make sure there
   // is a minimum separation between the toasts.
   int last_top = 0;
   for (int id = 0; id <= 3; ++id) {
     params.notification_id = id;
     EXPECT_TRUE(service_->ShowDesktopNotification(
         params, 0, 0, DesktopNotificationService::PageNotification));
     expected_log.append("notification displayed\n");
     int top = balloon_collection_->UppermostVerticalPosition();
     if (id > 0)
       EXPECT_LE(top, last_top - balloon_collection_->MinHeight());
     last_top = top;
   }
 
   EXPECT_EQ(expected_log, log_output_);
 }
 
 TEST_F(DesktopNotificationsTest, TestVariableSize) {
-  DesktopNotificationHostMsg_Show_Params params;
+  content::ShowDesktopNotificationHostMsgParams params;
   params.origin = GURL("http://long.google.com");
   params.is_html = false;
   params.icon_url = GURL("/icon.png");
   params.title = ASCIIToUTF16("Really Really Really Really Really Really "
                               "Really Really Really Really Really Really "
                               "Really Really Really Really Really Really "
                               "Really Long Title"),
   params.body = ASCIIToUTF16("Text");
   params.notification_id = 0;
 
@@ skipping 26 matching lines @@
   }
   EXPECT_EQ(expected_log, log_output_);
 }
 #endif
 
 TEST_F(DesktopNotificationsTest, TestQueueing) {
   int process_id = 0;
   int route_id = 0;
 
   // Request lots of identical notifications.
-  DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
+  content::ShowDesktopNotificationHostMsgParams params =
+      StandardTestNotification();
   const int kLotsOfToasts = 20;
   for (int id = 1; id <= kLotsOfToasts; ++id) {
     params.notification_id = id;
     EXPECT_TRUE(service_->ShowDesktopNotification(
         params, process_id, route_id,
         DesktopNotificationService::PageNotification));
   }
   MessageLoopForUI::current()->RunAllPending();
 
   // Build up an expected log of what should be happening.
@@ skipping 33 matching lines @@
     }
   }
 
   // Verify that the balloon collection is now empty.
   EXPECT_EQ(0, balloon_collection_->count());
 }
 
 TEST_F(DesktopNotificationsTest, TestEarlyDestruction) {
   // Create some toasts and then prematurely delete the notification service,
   // just to make sure nothing crashes/leaks.
-  DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
+  content::ShowDesktopNotificationHostMsgParams params =
+      StandardTestNotification();
   for (int id = 0; id <= 3; ++id) {
     params.notification_id = id;
     EXPECT_TRUE(service_->ShowDesktopNotification(
         params, 0, 0, DesktopNotificationService::PageNotification));
   }
   service_.reset(NULL);
 }
 
 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.
-  DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
+  content::ShowDesktopNotificationHostMsgParams 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;
   EXPECT_TRUE(service_->ShowDesktopNotification(
       params, 0, 0, DesktopNotificationService::PageNotification));
 
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(1, balloon_collection_->count());
   Balloon* balloon = (*balloon_collection_->balloons().begin());
   GURL data_url = balloon->notification().content_url();
   EXPECT_EQ(std::string::npos, data_url.spec().find("<script>"));
   EXPECT_EQ(std::string::npos, data_url.spec().find("<i>"));
   // URL-encoded versions of tags should also not be found.
   EXPECT_EQ(std::string::npos, data_url.spec().find("%3cscript%3e"));
   EXPECT_EQ(std::string::npos, data_url.spec().find("%3ci%3e"));
 }
 
 TEST_F(DesktopNotificationsTest, TestBoundingBox) {
   // Create some notifications.
-  DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
+  content::ShowDesktopNotificationHostMsgParams params =
+      StandardTestNotification();
   for (int id = 0; id <= 3; ++id) {
     params.notification_id = id;
     EXPECT_TRUE(service_->ShowDesktopNotification(
         params, 0, 0, DesktopNotificationService::PageNotification));
   }
 
   gfx::Rect box = balloon_collection_->GetBalloonsBoundingBox();
 
   // Try this for all positions.
   BalloonCollection::PositionPreference pref;
@@ skipping 16 matching lines @@
     }
   }
 }
 
 TEST_F(DesktopNotificationsTest, TestPositionPreference) {
   // Set position preference to lower right.
   local_state_.SetInteger(prefs::kDesktopNotificationPosition,
                           BalloonCollection::LOWER_RIGHT);
 
   // Create some notifications.
-  DesktopNotificationHostMsg_Show_Params params = StandardTestNotification();
+  content::ShowDesktopNotificationHostMsgParams params =
+      StandardTestNotification();
   for (int id = 0; id <= 3; ++id) {
     params.notification_id = id;
     EXPECT_TRUE(service_->ShowDesktopNotification(
         params, 0, 0, DesktopNotificationService::PageNotification));
   }
 
   std::deque<Balloon*>& balloons = balloon_collection_->balloons();
   std::deque<Balloon*>::iterator iter;
 
   // Check that they decrease in y-position (for MAC, with reversed
@@ skipping 46 matching lines @@
   }
 
   // Now change the position to upper left.  Confirm that the X value for the
   // balloons gets smaller.
   local_state_.SetInteger(prefs::kDesktopNotificationPosition,
                           BalloonCollection::UPPER_LEFT);
 
   int current_x = (*balloons.begin())->GetPosition().x();
   EXPECT_LT(current_x, last_x);
 }