Move IdentityProvider usage from GCMDriverDesktop to GCMProfileService

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 41 matching lines @@
  protected:
   GCMProfileServiceTest();
   virtual ~GCMProfileServiceTest();
 
   // testing::Test:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   FakeGCMClient* GetGCMClient() const;
 
+  void CreateGCMProfileService();
+  void SignIn();
+
   void RegisterAndWaitForCompletion(const std::vector<std::string>& sender_ids);
   void UnregisterAndWaitForCompletion();
   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,
@@ skipping 37 matching lines @@
 FakeGCMClient* GCMProfileServiceTest::GetGCMClient() const {
   return static_cast<FakeGCMClient*>(
       gcm_profile_service_->driver()->GetGCMClientForTesting());
 }
 
 void GCMProfileServiceTest::SetUp() {
   TestingProfile::Builder builder;
   builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
                             FakeSigninManager::Build);
   profile_ = builder.Build();
+}
 
+void GCMProfileServiceTest::TearDown() {
+  gcm_profile_service_->driver()->RemoveAppHandler(kTestAppID);
+}
+
+void GCMProfileServiceTest::CreateGCMProfileService() {
   gcm_profile_service_ = static_cast<GCMProfileService*>(
       GCMProfileServiceFactory::GetInstance()->SetTestingFactoryAndUse(
           profile_.get(),
           &BuildGCMProfileService));
   gcm_profile_service_->driver()->AddAppHandler(
       kTestAppID, gcm_app_handler_.get());
+}
 
+void GCMProfileServiceTest::SignIn() {
   FakeSigninManager* signin_manager = static_cast<FakeSigninManager*>(
       SigninManagerFactory::GetInstance()->GetForProfile(profile_.get()));
   signin_manager->SignIn(kTestAccountID);
   base::RunLoop().RunUntilIdle();
 }
 
-void GCMProfileServiceTest::TearDown() {
-  gcm_profile_service_->driver()->RemoveAppHandler(kTestAppID);
-}
-
 void GCMProfileServiceTest::RegisterAndWaitForCompletion(
     const std::vector<std::string>& sender_ids) {
   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();
@@ skipping 40 matching lines @@
 
 void GCMProfileServiceTest::SendCompleted(
     const base::Closure& callback,
     const std::string& message_id,
     GCMClient::Result result) {
   send_message_id_ = message_id;
   send_result_ = result;
   callback.Run();
 }
 
+TEST_F(GCMProfileServiceTest, CreateGCMProfileServiceBeforeSignIn) {
+  CreateGCMProfileService();
+  EXPECT_FALSE(driver()->IsStarted());
+
+  SignIn();
+  EXPECT_TRUE(driver()->IsStarted());
+}
+
+TEST_F(GCMProfileServiceTest, CreateGCMProfileServiceAfterSignIn) {
+  SignIn();
+  // Note that we can't check if the GCM is started or not since the

[bartfab (slow), 2014/06/13 11:27:21]

Nit: s/the GCM/GCM/

[jianli, 2014/06/13 18:04:48]

Done.

+  // GCMProfileService that hosts the GCMDriver is not created yet.
+
+  CreateGCMProfileService();
+  EXPECT_TRUE(driver()->IsStarted());
+}
+
 TEST_F(GCMProfileServiceTest, RegisterAndUnregister) {
+  CreateGCMProfileService();
+  SignIn();
+
   std::vector<std::string> sender_ids;
   sender_ids.push_back("sender");
   RegisterAndWaitForCompletion(sender_ids);
 
   std::string expected_registration_id =
       FakeGCMClient::GetRegistrationIdFromSenderIds(sender_ids);
   EXPECT_EQ(expected_registration_id, registration_id());
   EXPECT_EQ(GCMClient::SUCCESS, registration_result());
 
   UnregisterAndWaitForCompletion();
   EXPECT_EQ(GCMClient::SUCCESS, unregistration_result());
 }
 
 TEST_F(GCMProfileServiceTest, Send) {
+  CreateGCMProfileService();
+  SignIn();
+
   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