Rename GCMClient::Load to GCMClient::Start

This is to address TODO and keep the naming consistent.

BUG=none
TEST=none due to no functionality changes

Review URL: https://codereview.chromium.org/285623002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270020 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_gcm_app_handler_unittest.cc

@@ -216,7 +216,7 @@ class ExtensionGCMAppHandlerTest : public testing::Test {
                     profile(),
                     &ExtensionGCMAppHandlerTest::BuildGCMProfileService));
     scoped_ptr<gcm::GCMClientFactory> gcm_client_factory(
-        new gcm::FakeGCMClientFactory(gcm::GCMClientMock::NO_DELAY_LOADING));
+        new gcm::FakeGCMClientFactory(gcm::GCMClientMock::NO_DELAY_START));
     gcm_profile_service->Initialize(gcm_client_factory.Pass());
 
     // Create a fake version of ExtensionGCMAppHandler.

chrome/browser/services/gcm/fake_gcm_client_factory.cc

@@ -10,15 +10,15 @@
 namespace gcm {
 
 FakeGCMClientFactory::FakeGCMClientFactory(
-    GCMClientMock::LoadingDelay gcm_client_loading_delay)
-    : gcm_client_loading_delay_(gcm_client_loading_delay) {
+    GCMClientMock::StartMode gcm_client_start_mode)
+    : gcm_client_start_mode_(gcm_client_start_mode) {
 }
 
 FakeGCMClientFactory::~FakeGCMClientFactory() {
 }
 
 scoped_ptr<GCMClient> FakeGCMClientFactory::BuildInstance() {
-  return scoped_ptr<GCMClient>(new GCMClientMock(gcm_client_loading_delay_));
+  return scoped_ptr<GCMClient>(new GCMClientMock(gcm_client_start_mode_));
 }
 
 }  // namespace gcm

chrome/browser/services/gcm/fake_gcm_client_factory.h

@@ -16,15 +16,14 @@ class GCMClient;
 
 class FakeGCMClientFactory : public GCMClientFactory {
  public:
-  explicit FakeGCMClientFactory(
-      GCMClientMock::LoadingDelay gcm_client_loading_delay);
+  explicit FakeGCMClientFactory(GCMClientMock::StartMode gcm_client_start_mode);
   virtual ~FakeGCMClientFactory();
 
   // GCMClientFactory:
   virtual scoped_ptr<GCMClient> BuildInstance() OVERRIDE;
 
  private:
-  GCMClientMock::LoadingDelay gcm_client_loading_delay_;
+  GCMClientMock::StartMode gcm_client_start_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeGCMClientFactory);
 };

chrome/browser/services/gcm/gcm_client_mock.cc

@@ -13,10 +13,10 @@
 
 namespace gcm {
 
-GCMClientMock::GCMClientMock(LoadingDelay loading_delay)
+GCMClientMock::GCMClientMock(StartMode start_mode)
     : delegate_(NULL),
       status_(UNINITIALIZED),
-      loading_delay_(loading_delay),
+      start_mode_(start_mode),
       weak_ptr_factory_(this) {
 }
 
@@ -34,17 +34,17 @@ void GCMClientMock::Initialize(
   delegate_ = delegate;
 }
 
-void GCMClientMock::Load() {
+void GCMClientMock::Start() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  DCHECK_NE(LOADED, status_);
+  DCHECK_NE(STARTED, status_);
 
-  if (loading_delay_ == DELAY_LOADING)
+  if (start_mode_ == DELAY_START)
     return;
   DoLoading();
 }
 
 void GCMClientMock::DoLoading() {
-  status_ = LOADED;
+  status_ = STARTED;
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&GCMClientMock::CheckinFinished,

chrome/browser/services/gcm/gcm_client_mock.h

@@ -15,18 +15,17 @@ class GCMClientMock : public GCMClient {
  public:
   enum Status {
     UNINITIALIZED,
-    LOADED,
+    STARTED,
     STOPPED,
     CHECKED_OUT
   };
 
-  enum LoadingDelay {
-    NO_DELAY_LOADING,
-    DELAY_LOADING,
+  enum StartMode {
+    NO_DELAY_START,
+    DELAY_START,
   };
 
-  // |loading_delay| denotes if the check-in should be delayed.
-  explicit GCMClientMock(LoadingDelay loading_delay);
+  explicit GCMClientMock(StartMode start_mode);
   virtual ~GCMClientMock();
 
   // Overridden from GCMClient:
@@ -39,7 +38,7 @@ class GCMClientMock : public GCMClient {
       const scoped_refptr<net::URLRequestContextGetter>&
           url_request_context_getter,
       Delegate* delegate) OVERRIDE;
-  virtual void Load() OVERRIDE;
+  virtual void Start() OVERRIDE;
   virtual void Stop() OVERRIDE;
   virtual void CheckOut() OVERRIDE;
   virtual void Register(const std::string& app_id,
@@ -83,7 +82,7 @@ class GCMClientMock : public GCMClient {
 
   Delegate* delegate_;
   Status status_;
-  LoadingDelay loading_delay_;
+  StartMode start_mode_;
   base::WeakPtrFactory<GCMClientMock> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMClientMock);

chrome/browser/services/gcm/gcm_profile_service_unittest.cc

@@ -96,7 +96,7 @@ void GCMProfileServiceTest::SetUp() {
           profile_.get(),
           &BuildGCMProfileService));
   gcm_profile_service_->Initialize(scoped_ptr<GCMClientFactory>(
-      new FakeGCMClientFactory(GCMClientMock::NO_DELAY_LOADING)));
+      new FakeGCMClientFactory(GCMClientMock::NO_DELAY_START)));
 
   FakeSigninManager* signin_manager = static_cast<FakeSigninManager*>(
       SigninManagerFactory::GetInstance()->GetForProfile(profile_.get()));
@@ -158,7 +158,7 @@ TEST_F(GCMProfileServiceTest, RegisterUnderNeutralChannelSignal) {
 
   // GCMClient should be checked in.
   EXPECT_TRUE(gcm_profile_service_->IsGCMClientReady());
-  EXPECT_EQ(GCMClientMock::LOADED, GetGCMClient()->status());
+  EXPECT_EQ(GCMClientMock::STARTED, GetGCMClient()->status());
 
   // Registration should succeed.
   std::string expected_registration_id =
@@ -180,7 +180,7 @@ TEST_F(GCMProfileServiceTest, SendUnderNeutralChannelSignal) {
 
   // GCMClient should be checked in.
   EXPECT_TRUE(gcm_profile_service_->IsGCMClientReady());
-  EXPECT_EQ(GCMClientMock::LOADED, GetGCMClient()->status());
+  EXPECT_EQ(GCMClientMock::STARTED, GetGCMClient()->status());
 
   // Sending should succeed.
   EXPECT_EQ(message.id, send_message_id_);

chrome/browser/services/gcm/gcm_service.cc

@@ -154,7 +154,7 @@ class GCMService::IOWorker : public GCMClient::Delegate {
                   const std::vector<std::string>& account_ids,
                   const scoped_refptr<net::URLRequestContextGetter>&
                       url_request_context_getter);
-  void Load(const base::WeakPtr<GCMService>& service);
+  void Start(const base::WeakPtr<GCMService>& service);
   void Stop();
   void CheckOut();
   void Register(const std::string& app_id,
@@ -304,11 +304,11 @@ void GCMService::IOWorker::OnActivityRecorded() {
   GetGCMStatistics(false);
 }
 
-void GCMService::IOWorker::Load(const base::WeakPtr<GCMService>& service) {
+void GCMService::IOWorker::Start(const base::WeakPtr<GCMService>& service) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
 
   service_ = service;
-  gcm_client_->Load();
+  gcm_client_->Start();
 }
 
 void GCMService::IOWorker::Stop() {
@@ -410,18 +410,17 @@ void GCMService::Initialize(scoped_ptr<GCMClientFactory> gcm_client_factory) {
                  account_ids,
                  GetURLRequestContextGetter()));
 
-  // Load from the GCM store and initiate the GCM check-in if the rollout signal
-  // indicates yes.
+  // Start the GCM service if the rollout signal indicates yes.
   if (ShouldStartAutomatically())
-    EnsureLoaded();
+    EnsureStarted();
 
   identity_provider_->AddObserver(this);
 }
 
 void GCMService::Start() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
-  EnsureLoaded();
+  EnsureStarted();
 }
 
 void GCMService::Stop() {
@@ -667,14 +666,14 @@ void GCMService::SetGCMRecording(GetGCMStatisticsCallback callback,
 
 void GCMService::OnActiveAccountLogin() {
   if (ShouldStartAutomatically())
-    EnsureLoaded();
+    EnsureStarted();
 }
 
 void GCMService::OnActiveAccountLogout() {
   CheckOut();
 }
 
-void GCMService::EnsureLoaded() {
+void GCMService::EnsureStarted() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   const std::string account_id = identity_provider_->GetActiveAccountId();
   if (account_id.empty())
@@ -690,14 +689,12 @@ void GCMService::EnsureLoaded() {
   DCHECK(!delayed_task_controller_);
   delayed_task_controller_.reset(new DelayedTaskController);
 
-  // This will load the data from the gcm store and trigger the check-in if
-  // the persisted check-in info is not found.
   // Note that we need to pass weak pointer again since the existing weak
   // pointer in IOWorker might have been invalidated when check-out occurs.
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
-      base::Bind(&GCMService::IOWorker::Load,
+      base::Bind(&GCMService::IOWorker::Start,
                  base::Unretained(io_worker_.get()),
                  weak_ptr_factory_.GetWeakPtr()));
 }
@@ -733,10 +730,11 @@ void GCMService::CheckOut() {
 
 GCMClient::Result GCMService::EnsureAppReady(const std::string& app_id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  // Ensure that check-in has been done.
-  EnsureLoaded();
 
-  // If the service was not started, bail out.
+  // Starts the service if not yet.
+  EnsureStarted();
+
+  // If the service cannot be started, bail out.
   if (account_id_.empty())
     return GCMClient::NOT_SIGNED_IN;
 

chrome/browser/services/gcm/gcm_service.h

@@ -130,9 +130,9 @@ class GCMService : public IdentityProvider::Observer {
 
   typedef std::map<std::string, GCMAppHandler*> GCMAppHandlerMap;
 
-  // Ensures that the GCMClient is loaded and the GCM check-in is done if the
+  // Ensures that the GCMClient is started and the GCM check-in is done if the
   // |identity_provider_| is able to supply an account ID.
-  void EnsureLoaded();
+  void EnsureStarted();
 
   // Remove cached data when GCM service is stopped.
   void RemoveCachedData();