Push API: Fix unsubscribing from GCM on Android

chrome/browser/services/gcm/gcm_profile_service_unittest.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 "chrome/browser/services/gcm/gcm_profile_service.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 43 matching lines @@
 
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
   FakeGCMClient* GetGCMClient() const;
 
   void CreateGCMProfileService();
 
   void RegisterAndWaitForCompletion(const std::vector<std::string>& sender_ids);
-  void UnregisterAndWaitForCompletion();
+  void UnregisterAndWaitForCompletion(
+      const std::vector<std::string>& sender_ids);
   void SendAndWaitForCompletion(const GCMClient::OutgoingMessage& message);
 
   void RegisterCompleted(const base::Closure& callback,
                          const std::string& registration_id,
                          GCMClient::Result result);
   void UnregisterCompleted(const base::Closure& callback,
                            GCMClient::Result result);
   void SendCompleted(const base::Closure& callback,
                      const std::string& message_id,
                      GCMClient::Result result);
@@ skipping 65 matching lines @@
   base::RunLoop run_loop;
   gcm_profile_service_->driver()->Register(
       kTestAppID,
       sender_ids,
       base::Bind(&GCMProfileServiceTest::RegisterCompleted,
                  base::Unretained(this),
                  run_loop.QuitClosure()));
   run_loop.Run();
 }
 
-void GCMProfileServiceTest::UnregisterAndWaitForCompletion() {
+void GCMProfileServiceTest::UnregisterAndWaitForCompletion(
+    const std::vector<std::string>& sender_ids) {
   base::RunLoop run_loop;
   gcm_profile_service_->driver()->Unregister(
       kTestAppID,
+      sender_ids,
       base::Bind(&GCMProfileServiceTest::UnregisterCompleted,
                  base::Unretained(this),
                  run_loop.QuitClosure()));
   run_loop.Run();
 }
 
 void GCMProfileServiceTest::SendAndWaitForCompletion(
     const GCMClient::OutgoingMessage& message) {
   base::RunLoop run_loop;
   gcm_profile_service_->driver()->Send(
@@ skipping 36 matching lines @@
 
   std::vector<std::string> sender_ids;
   sender_ids.push_back("sender");
   RegisterAndWaitForCompletion(sender_ids);
 
   std::string expected_registration_id =
       GetGCMClient()->GetRegistrationIdFromSenderIds(sender_ids);
   EXPECT_EQ(expected_registration_id, registration_id());
   EXPECT_EQ(GCMClient::SUCCESS, registration_result());
 
-  UnregisterAndWaitForCompletion();
+  UnregisterAndWaitForCompletion(sender_ids);
   EXPECT_EQ(GCMClient::SUCCESS, unregistration_result());
 }
 
 TEST_F(GCMProfileServiceTest, Send) {
   CreateGCMProfileService();
 
   GCMClient::OutgoingMessage message;
   message.id = "1";
   message.data["key1"] = "value1";
   SendAndWaitForCompletion( message);
 
   EXPECT_EQ(message.id, send_message_id());
   EXPECT_EQ(GCMClient::SUCCESS, send_result());
 }
 
 }  // namespace gcm