[GCM] Only allow the senders that the application is currently registered for

chrome/browser/services/gcm/gcm_profile_service_unittest.cc

Index: chrome/browser/services/gcm/gcm_profile_service_unittest.cc
diff --git a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
index 10870fe3a1749ad6caa2d22d194bd3de2241b657..be3699205d7aaa7bdb43781d1da6ba79bda26eed 100644
--- a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
@@ -993,9 +993,12 @@ TEST_F(GCMProfileServiceSingleProfileTest, SendError) {
 }
 
 TEST_F(GCMProfileServiceSingleProfileTest, MessageReceived) {
+  consumer()->Register(kTestingAppId, "sender");
+  WaitUntilCompleted();
   GCMClient::IncomingMessage message;
   message.data["key1"] = "value1";
   message.data["key2"] = "value2";
+  message.sender_id = "sender";
   consumer()->GetGCMClient()->ReceiveMessage(kTestingAppId, message);
   WaitUntilCompleted();
   EXPECT_EQ(FakeGCMEventRouter::MESSAGE_EVENT,
@@ -1003,12 +1006,17 @@ TEST_F(GCMProfileServiceSingleProfileTest, MessageReceived) {
   EXPECT_EQ(kTestingAppId, consumer()->gcm_event_router()->app_id());
   EXPECT_TRUE(message.data == consumer()->gcm_event_router()->message().data);
   EXPECT_TRUE(consumer()->gcm_event_router()->message().collapse_key.empty());
+  EXPECT_EQ(message.sender_id,
+            consumer()->gcm_event_router()->message().sender_id);
 }
 
 TEST_F(GCMProfileServiceSingleProfileTest, MessageWithCollapseKeyReceived) {
+  consumer()->Register(kTestingAppId, "sender");
+  WaitUntilCompleted();
   GCMClient::IncomingMessage message;
   message.data["key1"] = "value1";
   message.collapse_key = "collapse_key_value";
+  message.sender_id = "sender";
   consumer()->GetGCMClient()->ReceiveMessage(kTestingAppId, message);
   WaitUntilCompleted();
   EXPECT_EQ(FakeGCMEventRouter::MESSAGE_EVENT,
@@ -1017,6 +1025,41 @@ TEST_F(GCMProfileServiceSingleProfileTest, MessageWithCollapseKeyReceived) {
   EXPECT_TRUE(message.data == consumer()->gcm_event_router()->message().data);
   EXPECT_EQ(message.collapse_key,
             consumer()->gcm_event_router()->message().collapse_key);
+  EXPECT_EQ(message.sender_id,
+            consumer()->gcm_event_router()->message().sender_id);
+}
+
+TEST_F(GCMProfileServiceSingleProfileTest,
+       MessageNotReceivedFromNotRegisteredSender) {
+  // Explicitly not registering the sender here, so that message gets dropped.
+  GCMClient::IncomingMessage message;
+  message.data["key1"] = "value1";
+  message.data["key2"] = "value2";
+  message.sender_id = "sender";
+  consumer()->GetGCMClient()->ReceiveMessage(kTestingAppId, message);
+  PumpUILoop();
+  EXPECT_EQ(FakeGCMEventRouter::NO_EVENT,
+            consumer()->gcm_event_router()->received_event());
+  consumer()->gcm_event_router()->clear_results();
+
+  // Register for the sedner and try to receive the message again, which should
+  // work with no problems.
+  consumer()->Register(kTestingAppId, "sender");
+  WaitUntilCompleted();
+  consumer()->GetGCMClient()->ReceiveMessage(kTestingAppId, message);
+  WaitUntilCompleted();
+  EXPECT_EQ(FakeGCMEventRouter::MESSAGE_EVENT,
+            consumer()->gcm_event_router()->received_event());
+  consumer()->gcm_event_router()->clear_results();
+
+  // Register for a different sender and try to receive the message again from
+  // the old sender, which again should not create an event.
+  consumer()->Register(kTestingAppId, "sender2");
+  WaitUntilCompleted();
+  consumer()->GetGCMClient()->ReceiveMessage(kTestingAppId, message);
+  PumpUILoop();
+  EXPECT_EQ(FakeGCMEventRouter::NO_EVENT,
+            consumer()->gcm_event_router()->received_event());
 }
 
 TEST_F(GCMProfileServiceSingleProfileTest, MessagesDeleted) {
@@ -1128,15 +1171,24 @@ TEST_F(GCMProfileServiceMultiProfileTest, Send) {
 }
 
 TEST_F(GCMProfileServiceMultiProfileTest, MessageReceived) {
+  consumer()->Register(kTestingAppId, "sender");
+  consumer2()->Register(kTestingAppId, "sender");
+  consumer2()->Register(kTestingAppId2, "sender2");
+  WaitUntilCompleted();
+  WaitUntilCompleted();
+  WaitUntilCompleted();
+
   // Trigger an incoming message for an app in one profile.
   GCMClient::IncomingMessage message;
   message.data["key1"] = "value1";
   message.data["key2"] = "value2";
+  message.sender_id = "sender";
   consumer()->GetGCMClient()->ReceiveMessage(kTestingAppId, message);
 
   // Trigger an incoming message for the same app in another profile.
   GCMClient::IncomingMessage message2;
   message2.data["foo"] = "bar";
+  message2.sender_id = "sender";
   consumer2()->GetGCMClient()->ReceiveMessage(kTestingAppId, message2);
 
   WaitUntilCompleted();
@@ -1146,16 +1198,19 @@ TEST_F(GCMProfileServiceMultiProfileTest, MessageReceived) {
             consumer()->gcm_event_router()->received_event());
   EXPECT_EQ(kTestingAppId, consumer()->gcm_event_router()->app_id());
   EXPECT_TRUE(message.data == consumer()->gcm_event_router()->message().data);
+  EXPECT_EQ("sender", consumer()->gcm_event_router()->message().sender_id);
 
   EXPECT_EQ(FakeGCMEventRouter::MESSAGE_EVENT,
             consumer2()->gcm_event_router()->received_event());
   EXPECT_EQ(kTestingAppId, consumer2()->gcm_event_router()->app_id());
   EXPECT_TRUE(message2.data == consumer2()->gcm_event_router()->message().data);
+  EXPECT_EQ("sender", consumer2()->gcm_event_router()->message().sender_id);
 
   // Trigger another incoming message for a different app in another profile.
   GCMClient::IncomingMessage message3;
   message3.data["bar1"] = "foo1";
   message3.data["bar2"] = "foo2";
+  message3.sender_id = "sender2";
   consumer2()->GetGCMClient()->ReceiveMessage(kTestingAppId2, message3);
 
   WaitUntilCompleted();
@@ -1164,6 +1219,7 @@ TEST_F(GCMProfileServiceMultiProfileTest, MessageReceived) {
             consumer2()->gcm_event_router()->received_event());
   EXPECT_EQ(kTestingAppId2, consumer2()->gcm_event_router()->app_id());
   EXPECT_TRUE(message3.data == consumer2()->gcm_event_router()->message().data);
+  EXPECT_EQ("sender2", consumer2()->gcm_event_router()->message().sender_id);
 }
 
 // Test a set of GCM operations on multiple profiles.
@@ -1215,6 +1271,7 @@ TEST_F(GCMProfileServiceMultiProfileTest, Combined) {
   GCMClient::IncomingMessage in_message;
   in_message.data["in1"] = "in_data1";
   in_message.data["in1_2"] = "in_data1_2";
+  in_message.sender_id = "sender1";
   consumer()->GetGCMClient()->ReceiveMessage(kTestingAppId, in_message);
 
   WaitUntilCompleted();
@@ -1229,11 +1286,13 @@ TEST_F(GCMProfileServiceMultiProfileTest, Combined) {
   // profile.
   GCMClient::IncomingMessage in_message2;
   in_message2.data["in2"] = "in_data2";
+  in_message2.sender_id = "sender3";
   consumer2()->GetGCMClient()->ReceiveMessage(kTestingAppId2, in_message2);
 
   GCMClient::IncomingMessage in_message3;
   in_message3.data["in3"] = "in_data3";
   in_message3.data["in3_2"] = "in_data3_2";
+  in_message3.sender_id = "sender2";
   consumer2()->GetGCMClient()->ReceiveMessage(kTestingAppId, in_message3);
 
   consumer2()->gcm_event_router()->clear_results();
@@ -1322,9 +1381,14 @@ TEST_F(GCMProfileServiceMultiProfileTest, Combined) {
   // Sign in with a different user.
   consumer()->SignIn(kTestingUsername3);
 
+  // Signing out cleared all registrations so we need to register again.
+  consumer()->Register(kTestingAppId, "sender1");
+  WaitUntilCompleted();
+
   // Incoming message will go through for the new signed-in user.
   GCMClient::IncomingMessage in_message5;
   in_message5.data["in5"] = "in_data5";
+  in_message5.sender_id = "sender1";
   consumer()->GetGCMClient()->ReceiveMessage(kTestingAppId, in_message5);
 
   consumer()->gcm_event_router()->clear_results();