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

Unified Diff: chrome/browser/services/gcm/gcm_profile_service_unittest.cc

Issue 285623002: Rename GCMClient::Load to GCMClient::Start (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch Created 6 years, 7 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 | « chrome/browser/services/gcm/gcm_client_mock.cc ('k') | chrome/browser/services/gcm/gcm_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6fef486dbb9f04e4dcb8f58d5c7dd92d599b757f..6ac3ceb8a943ad234c855299adab36b9d8a8e526 100644
--- a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
+++ b/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_);
« no previous file with comments | « chrome/browser/services/gcm/gcm_client_mock.cc ('k') | chrome/browser/services/gcm/gcm_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698