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

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

Issue 135903005: [GCM] Reland: Introduce GCMClientFactory to create GCMClient for GCMProfileService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch to land Created 6 years, 11 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_profile_service.cc ('k') | chrome/chrome_browser.gypi » ('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 240b7857045bc36de58ddbc997bd15d4bafad99b..99b05c89ff687062262ba54cf1bf9e4a8faf4817 100644
--- a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/extensions/state_store.h"
#include "chrome/browser/extensions/test_extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
+#include "chrome/browser/services/gcm/gcm_client_factory.h"
#include "chrome/browser/services/gcm/gcm_client_mock.h"
#include "chrome/browser/services/gcm/gcm_event_router.h"
#include "chrome/browser/services/gcm/gcm_profile_service.h"
@@ -135,7 +136,7 @@ class GCMProfileServiceTest : public testing::Test,
#endif
// Mock a GCMClient.
- GCMClient::SetTestingFactory(&GCMProfileServiceTest::BuildGCMClient);
+ GCMClientFactory::SetTestingFactory(&GCMProfileServiceTest::BuildGCMClient);
// Mock a GCMEventRouter.
gcm_event_router_mock_.reset(new GCMEventRouterMock(this));
@@ -244,7 +245,7 @@ class GCMProfileServiceTest : public testing::Test,
};
static GCMClientMock* GetGCMClientMock() {
- return static_cast<GCMClientMock*>(GCMClient::Get());
+ return static_cast<GCMClientMock*>(GCMClientFactory::GetClient());
}
class ScopedGCMClientMockSimulateServerError {
« no previous file with comments | « chrome/browser/services/gcm/gcm_profile_service.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698