Remove plumbing for showing HTML notifications from content/.

chrome/browser/notifications/desktop_notifications_unittest.cc

 // Copyright (c) 2012 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/prefs/testing_pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/notifications/balloon_notification_ui_manager.h"
@@ skipping 127 matching lines @@
   ui::TerminateContextFactoryForTests();
 #endif
   ui::ShutdownInputMethodForTesting();
 }
 
 content::ShowDesktopNotificationHostMsgParams
 DesktopNotificationsTest::StandardTestNotification() {
   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 = blink::WebTextDirectionDefault;
   return params;
 }
 
 TEST_F(DesktopNotificationsTest, TestShow) {
   content::ShowDesktopNotificationHostMsgParams params =
       StandardTestNotification();
   params.notification_id = 1;
 
   EXPECT_TRUE(service_->ShowDesktopNotification(
       params, 0, 0, DesktopNotificationService::PageNotification));
   base::MessageLoopForUI::current()->RunUntilIdle();
   EXPECT_EQ(1, balloon_collection_->count());
 
-  content::ShowDesktopNotificationHostMsgParams params2;
+  content::ShowDesktopNotificationHostMsgParams params2 =
+      StandardTestNotification();
+  params2.notification_id = 2;
   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;
+  params2.body = ASCIIToUTF16("Text");
 
   EXPECT_TRUE(service_->ShowDesktopNotification(
       params2, 0, 0, DesktopNotificationService::PageNotification));
   base::MessageLoopForUI::current()->RunUntilIdle();
   EXPECT_EQ(2, balloon_collection_->count());
 
   EXPECT_EQ("notification displayed\n"
             "notification displayed\n",
             log_output_);
 }
@@ skipping 66 matching lines @@
       EXPECT_LE(top, last_top - balloon_collection_->MinHeight());
     last_top = top;
   }
 
   EXPECT_EQ(expected_log, log_output_);
 }
 
 TEST_F(DesktopNotificationsTest, TestVariableSize) {
   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;
 
   std::string expected_log;
   // Create some toasts.  After each but the first, make sure there
@@ skipping 299 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);
 }