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

Unified Diff: components/gcm_driver/gcm_driver_desktop_unittest.cc

Issue 2578583002: Provide a mechanism for the GCM driver to send message receipts to GCM.
Patch Set: Fix issue with rebase Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/gcm_driver/gcm_driver_desktop.cc ('k') | components/gcm_driver/gcm_message_status.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/gcm_driver/gcm_driver_desktop_unittest.cc
diff --git a/components/gcm_driver/gcm_driver_desktop_unittest.cc b/components/gcm_driver/gcm_driver_desktop_unittest.cc
index ef83a49532f4dd449f9394b7ff274b9101c4ac10..25430495484a01eb6a5a74f208dd89718e2c091a 100644
--- a/components/gcm_driver/gcm_driver_desktop_unittest.cc
+++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc
@@ -41,6 +41,7 @@ namespace {
const char kTestAppID1[] = "TestApp1";
const char kTestAppID2[] = "TestApp2";
+const char kTestMessageID[] = "TestMessage1";
const char kUserID1[] = "user1";
const char kScope[] = "GCM";
const char kInstanceID1[] = "IID1";
@@ -841,7 +842,7 @@ TEST_F(GCMDriverFunctionalTest, MessageReceived) {
message.data["key1"] = "value1";
message.data["key2"] = "value2";
message.sender_id = "sender";
- GetGCMClient()->ReceiveMessage(kTestAppID1, message);
+ GetGCMClient()->ReceiveMessage(kTestAppID1, kTestMessageID, message);
gcm_app_handler()->WaitForNotification();
EXPECT_EQ(FakeGCMAppHandler::MESSAGE_EVENT,
gcm_app_handler()->received_event());
@@ -859,7 +860,7 @@ TEST_F(GCMDriverFunctionalTest, MessageWithCollapseKeyReceived) {
message.data["key1"] = "value1";
message.collapse_key = "collapse_key_value";
message.sender_id = "sender";
- GetGCMClient()->ReceiveMessage(kTestAppID1, message);
+ GetGCMClient()->ReceiveMessage(kTestAppID1, kTestMessageID, message);
gcm_app_handler()->WaitForNotification();
EXPECT_EQ(FakeGCMAppHandler::MESSAGE_EVENT,
gcm_app_handler()->received_event());
@@ -883,7 +884,7 @@ TEST_F(GCMDriverFunctionalTest, EncryptedMessageReceivedError) {
message.raw_data = "foobar";
GetGCMClient()->SetRecording(true);
- GetGCMClient()->ReceiveMessage(kTestAppID1, message);
+ GetGCMClient()->ReceiveMessage(kTestAppID1, kTestMessageID, message);
PumpIOLoop();
PumpUILoop();
« no previous file with comments | « components/gcm_driver/gcm_driver_desktop.cc ('k') | components/gcm_driver/gcm_message_status.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698