chrome/browser/services/gcm/push_messaging_browsertest.cc - Issue 785983002: Have FakeGCMProfileService return different registration IDs each time

Unified Diff: chrome/browser/services/gcm/push_messaging_browsertest.cc

Issue 785983002: Have FakeGCMProfileService return different registration IDs each time (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Tweak argument wrapping Created 6 years 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

« no previous file with comments | « chrome/browser/services/gcm/fake_gcm_profile_service.cc ('k') | chrome/test/data/extensions/api_test/gcm/functions/register_validation/register_validation.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/services/gcm/push_messaging_browsertest.cc

diff --git a/chrome/browser/services/gcm/push_messaging_browsertest.cc b/chrome/browser/services/gcm/push_messaging_browsertest.cc

index 6dfd3b1ac50d09073524549acca3712bdec53ab3..e799e766749d7bf3e497753641809cfc80573367 100644

--- a/chrome/browser/services/gcm/push_messaging_browsertest.cc

+++ b/chrome/browser/services/gcm/push_messaging_browsertest.cc

@@ -180,7 +180,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, RegisterSuccess) {

ASSERT_EQ("permission status - granted", script_result);

ASSERT_TRUE(RunScript("registerPush()", &script_result));

- EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1", script_result);

+ EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1-0", script_result);

PushMessagingApplicationId app_id(https_server()->GetURL(""), 0L);

EXPECT_EQ(app_id.ToString(), gcm_service()->last_registered_app_id());

@@ -244,7 +244,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, PushEventSuccess) {

ASSERT_EQ("permission status - granted", script_result);

ASSERT_TRUE(RunScript("registerPush()", &script_result));

- EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1", script_result);

+ EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1-0", script_result);

PushMessagingApplicationId app_id(https_server()->GetURL(""), 0L);

EXPECT_EQ(app_id.ToString(), gcm_service()->last_registered_app_id());

@@ -278,7 +278,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, PushEventNoServiceWorker) {

ASSERT_EQ("permission status - granted", script_result);

ASSERT_TRUE(RunScript("registerPush()", &script_result));

- EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1", script_result);

+ EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1-0", script_result);

PushMessagingApplicationId app_id(https_server()->GetURL(""), 0L);

EXPECT_EQ(app_id.ToString(), gcm_service()->last_registered_app_id());

@@ -327,7 +327,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, PushEventNoPermission) {

ASSERT_EQ("permission status - granted", script_result);

ASSERT_TRUE(RunScript("registerPush()", &script_result));

- EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1", script_result);

+ EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1-0", script_result);

PushMessagingApplicationId app_id(https_server()->GetURL(""), 0L);

EXPECT_EQ(app_id.ToString(), gcm_service()->last_registered_app_id());

@@ -386,7 +386,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, HasPermissionSaysGranted) {

EXPECT_EQ("permission status - granted", script_result);

ASSERT_TRUE(RunScript("registerPush()", &script_result));

- EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1", script_result);

+ EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1-0", script_result);

ASSERT_TRUE(RunScript("hasPermission()", &script_result));

EXPECT_EQ("permission status - granted", script_result);