Revert of Convert the WebRtcTestBase to use infobar and bubble autoresponders

chrome/browser/notifications/platform_notification_service_browsertest.cc

 // Copyright 2014 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 <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 140 matching lines @@
 
 // -----------------------------------------------------------------------------
 
 // TODO(peter): Move PlatformNotificationService-related tests over from
 // notification_browsertest.cc to this file.
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        DisplayPersistentNotificationWithoutPermission) {
   std::string script_result;
 
-  InfoBarResponder cancelling_responder(GetInfoBarService(),
-                                        InfoBarResponder::DENY);
+  InfoBarResponder cancelling_responder(GetInfoBarService(), false);
   ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
   EXPECT_EQ("denied", script_result);
 
   ASSERT_TRUE(RunScript("DisplayPersistentNotification()", &script_result));
   EXPECT_EQ(
       "TypeError: No notification permission has been granted for this origin.",
       script_result);
 
   ASSERT_EQ(0u, ui_manager()->GetNotificationCount());
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        DisplayPersistentNotificationWithPermission) {
   std::string script_result;
 
-  InfoBarResponder accepting_responder(GetInfoBarService(),
-                                       InfoBarResponder::ACCEPT);
+  InfoBarResponder accepting_responder(GetInfoBarService(), true);
   ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
   EXPECT_EQ("granted", script_result);
 
   ASSERT_TRUE(RunScript("DisplayPersistentNotification('action_none')",
        &script_result));
   EXPECT_EQ("ok", script_result);
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
 
   const Notification& notification = ui_manager()->GetNotificationAt(0);
   notification.delegate()->Click();
 
   ASSERT_TRUE(RunScript("GetMessageFromWorker()", &script_result));
   EXPECT_EQ("action_none", script_result);
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        WebNotificationOptionsReflection) {
   std::string script_result;
 
   // TODO(peter): It doesn't add much value if we use the InfoBarResponder for
   // each test. Rather, we should just toggle the content setting.
-  InfoBarResponder accepting_responder(GetInfoBarService(),
-                                       InfoBarResponder::ACCEPT);
+  InfoBarResponder accepting_responder(GetInfoBarService(), true);
   ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
   EXPECT_EQ("granted", script_result);
 
   ASSERT_TRUE(RunScript("DisplayPersistentAllOptionsNotification()",
                         &script_result));
   EXPECT_EQ("ok", script_result);
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
 
   // We don't use or check the notification's direction and language.
   const Notification& notification = ui_manager()->GetNotificationAt(0);
   EXPECT_EQ("Title", base::UTF16ToUTF8(notification.title()));
   EXPECT_EQ("Contents", base::UTF16ToUTF8(notification.message()));
   EXPECT_EQ("replace-id", notification.tag());
   EXPECT_FALSE(notification.icon().IsEmpty());
   EXPECT_TRUE(notification.silent());
 
   EXPECT_EQ(kIconWidth, notification.icon().Width());
   EXPECT_EQ(kIconHeight, notification.icon().Height());
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        WebNotificationOptionsVibrationPattern) {
   std::string script_result;
 
-  InfoBarResponder accepting_responder(GetInfoBarService(),
-                                       InfoBarResponder::ACCEPT);
+  InfoBarResponder accepting_responder(GetInfoBarService(), true);
   ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
   EXPECT_EQ("granted", script_result);
 
   ASSERT_TRUE(RunScript("DisplayPersistentNotificationVibrate()",
                         &script_result));
   EXPECT_EQ("ok", script_result);
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
 
   const Notification& notification = ui_manager()->GetNotificationAt(0);
   EXPECT_EQ("Title", base::UTF16ToUTF8(notification.title()));
   EXPECT_EQ("Contents", base::UTF16ToUTF8(notification.message()));
 
   EXPECT_THAT(notification.vibration_pattern(),
       testing::ElementsAreArray(kNotificationVibrationPattern));
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        CloseDisplayedPersistentNotification) {
   std::string script_result;
 
-  InfoBarResponder accepting_responder(GetInfoBarService(),
-                                       InfoBarResponder::ACCEPT);
+  InfoBarResponder accepting_responder(GetInfoBarService(), true);
   ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
   EXPECT_EQ("granted", script_result);
 
   ASSERT_TRUE(RunScript("DisplayPersistentNotification('action_close')",
       &script_result));
   EXPECT_EQ("ok", script_result);
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
 
   const Notification& notification = ui_manager()->GetNotificationAt(0);
   notification.delegate()->Click();
 
   ASSERT_TRUE(RunScript("GetMessageFromWorker()", &script_result));
   EXPECT_EQ("action_close", script_result);
 
   ASSERT_EQ(0u, ui_manager()->GetNotificationCount());
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        TestDisplayOriginContextMessage) {
   std::string script_result;
 
   // Creates a simple notification.
-  InfoBarResponder accepting_responder(GetInfoBarService(),
-                                       InfoBarResponder::ACCEPT);
+  InfoBarResponder accepting_responder(GetInfoBarService(), true);
   ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
   ASSERT_EQ("granted", script_result);
   ASSERT_TRUE(RunScript("DisplayPersistentNotification()", &script_result));
 
   net::HostPortPair host_port = ServerHostPort();
 
   const Notification& notification = ui_manager()->GetNotificationAt(0);
 
   EXPECT_EQ(base::UTF8ToUTF16(host_port.ToString()),
             notification.context_message());
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        CheckFilePermissionNotGranted) {
   // TODO(dewittj): This test verifies that a bug exists in Chrome; the test
   // will fail if the bug is fixed.  The
   // |PlatformNotificationServiceImpl::WebOriginDisplayName| function needs
   // to be updated to properly display file:// URL origins.
   // See crbug.com/402191.
   std::string script_result;
 
-  InfoBarResponder accepting_responder_web(GetInfoBarService(),
-                                           InfoBarResponder::ACCEPT);
+  InfoBarResponder accepting_responder_web(GetInfoBarService(), true);
 
   DesktopNotificationService* notification_service =
       DesktopNotificationServiceFactory::GetForProfile(browser()->profile());
   ASSERT_TRUE(notification_service);
   message_center::NotifierId web_notifier(TestPageUrl());
   EXPECT_FALSE(notification_service->IsNotifierEnabled(web_notifier));
   ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
   EXPECT_EQ("granted", script_result);
 
   EXPECT_TRUE(notification_service->IsNotifierEnabled(web_notifier));
 
   base::FilePath dir_source_root;
   EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &dir_source_root));
   base::FilePath full_file_path =
       dir_source_root.Append(server_root()).AppendASCII(kTestFileName);
   GURL file_url(net::FilePathToFileURL(full_file_path));
   ui_test_utils::NavigateToURL(browser(), file_url);
 
   message_center::NotifierId file_notifier(file_url);
   EXPECT_FALSE(notification_service->IsNotifierEnabled(file_notifier));
 
-  InfoBarResponder accepting_responder_file(GetInfoBarService(),
-                                            InfoBarResponder::ACCEPT);
+  InfoBarResponder accepting_responder_file(GetInfoBarService(), true);
   ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
   EXPECT_EQ("granted", script_result);
 
   EXPECT_FALSE(notification_service->IsNotifierEnabled(file_notifier))
       << "If this test fails, you may have fixed a bug preventing file origins "
       << "from sending their origin from Blink; if so you need to update the "
       << "display function for notification origins to show the file path.";
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
@@ skipping 26 matching lines @@
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
 
   const Notification& notification = ui_manager()->GetNotificationAt(0);
   EXPECT_FALSE(notification.icon().IsEmpty());
 
   EXPECT_EQ("Blob Title", base::UTF16ToUTF8(notification.title()));
   EXPECT_EQ(kIconWidth, notification.icon().Width());
   EXPECT_EQ(kIconHeight, notification.icon().Height());
 }