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

Side by Side Diff: chrome/browser/push_messaging/push_messaging_browsertest.cc

Issue 1175443002: Revert of Convert the WebRtcTestBase to use infobar and bubble autoresponders (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "base/barrier_closure.h" 8 #include "base/barrier_closure.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 }; 236 };
237 237
238 void PushMessagingBrowserTest::RequestAndAcceptPermission() { 238 void PushMessagingBrowserTest::RequestAndAcceptPermission() {
239 std::string script_result; 239 std::string script_result;
240 240
241 if (PermissionBubbleManager::Enabled()) { 241 if (PermissionBubbleManager::Enabled()) {
242 GetPermissionBubbleManager()->set_auto_response_for_test( 242 GetPermissionBubbleManager()->set_auto_response_for_test(
243 PermissionBubbleManager::ACCEPT_ALL); 243 PermissionBubbleManager::ACCEPT_ALL);
244 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); 244 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result));
245 } else { 245 } else {
246 InfoBarResponder infobar_accept_responder(GetInfoBarService(), 246 InfoBarResponder infobar_accept_responder(GetInfoBarService(), true);
247 InfoBarResponder::ACCEPT);
248 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); 247 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result));
249 } 248 }
250 EXPECT_EQ("permission status - granted", script_result); 249 EXPECT_EQ("permission status - granted", script_result);
251 } 250 }
252 251
253 void PushMessagingBrowserTest::RequestAndDenyPermission() { 252 void PushMessagingBrowserTest::RequestAndDenyPermission() {
254 std::string script_result; 253 std::string script_result;
255 254
256 if (PermissionBubbleManager::Enabled()) { 255 if (PermissionBubbleManager::Enabled()) {
257 GetPermissionBubbleManager()->set_auto_response_for_test( 256 GetPermissionBubbleManager()->set_auto_response_for_test(
258 PermissionBubbleManager::DENY_ALL); 257 PermissionBubbleManager::DENY_ALL);
259 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); 258 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result));
260 } else { 259 } else {
261 InfoBarResponder infobar_deny_responder(GetInfoBarService(), 260 InfoBarResponder infobar_deny_responder(GetInfoBarService(), false);
262 InfoBarResponder::DENY);
263 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); 261 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result));
264 } 262 }
265 EXPECT_EQ("permission status - denied", script_result); 263 EXPECT_EQ("permission status - denied", script_result);
266 } 264 }
267 265
268 void PushMessagingBrowserTest::TryToSubscribeSuccessfully( 266 void PushMessagingBrowserTest::TryToSubscribeSuccessfully(
269 const std::string& expected_push_subscription_id) { 267 const std::string& expected_push_subscription_id) {
270 std::string script_result; 268 std::string script_result;
271 269
272 EXPECT_TRUE(RunScript("registerServiceWorker()", &script_result)); 270 EXPECT_TRUE(RunScript("registerServiceWorker()", &script_result));
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 std::string script_result; 312 std::string script_result;
315 313
316 ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); 314 ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
317 ASSERT_EQ("ok - service worker registered", script_result); 315 ASSERT_EQ("ok - service worker registered", script_result);
318 316
319 if (PermissionBubbleManager::Enabled()) { 317 if (PermissionBubbleManager::Enabled()) {
320 GetPermissionBubbleManager()->set_auto_response_for_test( 318 GetPermissionBubbleManager()->set_auto_response_for_test(
321 PermissionBubbleManager::ACCEPT_ALL); 319 PermissionBubbleManager::ACCEPT_ALL);
322 ASSERT_TRUE(RunScript("subscribePush()", &script_result)); 320 ASSERT_TRUE(RunScript("subscribePush()", &script_result));
323 } else { 321 } else {
324 InfoBarResponder infobar_accept_responder(GetInfoBarService(), 322 InfoBarResponder infobar_accept_responder(GetInfoBarService(), true);
325 InfoBarResponder::ACCEPT);
326 ASSERT_TRUE(RunScript("subscribePush()", &script_result)); 323 ASSERT_TRUE(RunScript("subscribePush()", &script_result));
327 } 324 }
328 EXPECT_EQ(GetEndpointForSubscriptionId("1-0"), script_result); 325 EXPECT_EQ(GetEndpointForSubscriptionId("1-0"), script_result);
329 326
330 PushMessagingAppIdentifier app_identifier = 327 PushMessagingAppIdentifier app_identifier =
331 GetAppIdentifierForServiceWorkerRegistration(0LL); 328 GetAppIdentifierForServiceWorkerRegistration(0LL);
332 EXPECT_EQ(app_identifier.app_id(), gcm_service()->last_registered_app_id()); 329 EXPECT_EQ(app_identifier.app_id(), gcm_service()->last_registered_app_id());
333 EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]); 330 EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]);
334 } 331 }
335 332
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); 1158 ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
1162 ASSERT_EQ("false - not subscribed", script_result); 1159 ASSERT_EQ("false - not subscribed", script_result);
1163 } 1160 }
1164 1161
1165 INSTANTIATE_TEST_CASE_P(PushMessagingBrowserTestWithParams, 1162 INSTANTIATE_TEST_CASE_P(PushMessagingBrowserTestWithParams,
1166 PushMessagingBrowserTest, 1163 PushMessagingBrowserTest,
1167 testing::Values(true, false)); 1164 testing::Values(true, false));
1168 INSTANTIATE_TEST_CASE_P(PushMessagingIncognitoBrowserTestWithParams, 1165 INSTANTIATE_TEST_CASE_P(PushMessagingIncognitoBrowserTestWithParams,
1169 PushMessagingIncognitoBrowserTest, 1166 PushMessagingIncognitoBrowserTest,
1170 testing::Values(true, false)); 1167 testing::Values(true, false));
OLDNEW
« no previous file with comments | « chrome/browser/notifications/platform_notification_service_browsertest.cc ('k') | chrome/test/data/webrtc/getusermedia.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698