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

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

Issue 225403021: Extract Profile-independent GCMService from GCMProfileService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore real IO thread in unit tests. Remove sources of flakiness by waiting instead of pumping whe… Created 6 years, 8 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
Index: chrome/browser/services/gcm/gcm_profile_service_test_helper.cc
diff --git a/chrome/browser/services/gcm/gcm_profile_service_test_helper.cc b/chrome/browser/services/gcm/gcm_profile_service_test_helper.cc
deleted file mode 100644
index 2379482220c6fab2a9d4ef7046dd852df28a6255..0000000000000000000000000000000000000000
--- a/chrome/browser/services/gcm/gcm_profile_service_test_helper.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-// 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_test_helper.h"
-
-#include "base/bind.h"
-#include "base/prefs/pref_service.h"
-#include "base/run_loop.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/chrome_signin_client_factory.h"
-#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-#include "chrome/common/pref_names.h"
-#include "content/public/browser/browser_thread.h"
-
-namespace gcm {
-
-Waiter::Waiter() {
-}
-
-Waiter::~Waiter() {
-}
-
-void Waiter::WaitUntilCompleted() {
- run_loop_.reset(new base::RunLoop);
- run_loop_->Run();
-}
-
-void Waiter::SignalCompleted() {
- if (run_loop_ && run_loop_->running())
- run_loop_->Quit();
-}
-
-void Waiter::PumpUILoop() {
- base::MessageLoop::current()->RunUntilIdle();
-}
-
-void Waiter::PumpIOLoop() {
- content::BrowserThread::PostTask(
- content::BrowserThread::IO,
- FROM_HERE,
- base::Bind(&Waiter::OnIOLoopPump, base::Unretained(this)));
-
- WaitUntilCompleted();
-}
-
-void Waiter::PumpIOLoopCompleted() {
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-
- SignalCompleted();
-}
-
-void Waiter::OnIOLoopPump() {
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-
- content::BrowserThread::PostTask(
- content::BrowserThread::IO,
- FROM_HERE,
- base::Bind(&Waiter::OnIOLoopPumpCompleted, base::Unretained(this)));
-}
-
-void Waiter::OnIOLoopPumpCompleted() {
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-
- content::BrowserThread::PostTask(
- content::BrowserThread::UI,
- FROM_HERE,
- base::Bind(&Waiter::PumpIOLoopCompleted,
- base::Unretained(this)));
-}
-
-// static
-KeyedService* FakeSigninManager::Build(content::BrowserContext* context) {
- return new FakeSigninManager(static_cast<Profile*>(context));
-}
-
-FakeSigninManager::FakeSigninManager(Profile* profile)
-#if defined(OS_CHROMEOS)
- : SigninManagerBase(
- ChromeSigninClientFactory::GetInstance()->GetForProfile(profile)),
-#else
- : SigninManager(
- ChromeSigninClientFactory::GetInstance()->GetForProfile(profile),
- ProfileOAuth2TokenServiceFactory::GetForProfile(profile)),
-#endif
- profile_(profile) {
- Initialize(NULL);
-}
-
-FakeSigninManager::~FakeSigninManager() {
-}
-
-void FakeSigninManager::SignIn(const std::string& username) {
- SetAuthenticatedUsername(username);
- FOR_EACH_OBSERVER(Observer,
- observer_list_,
- GoogleSigninSucceeded(username, std::string()));
-}
-
-void FakeSigninManager::SignOut() {
- std::string username = GetAuthenticatedUsername();
- clear_authenticated_username();
- profile_->GetPrefs()->ClearPref(prefs::kGoogleServicesUsername);
- FOR_EACH_OBSERVER(Observer, observer_list_, GoogleSignedOut(username));
-}
-
-FakeGCMClientFactory::FakeGCMClientFactory(
- GCMClientMock::LoadingDelay gcm_client_loading_delay)
- : gcm_client_loading_delay_(gcm_client_loading_delay) {
-}
-
-FakeGCMClientFactory::~FakeGCMClientFactory() {
-}
-
-scoped_ptr<GCMClient> FakeGCMClientFactory::BuildInstance() {
- return scoped_ptr<GCMClient>(new GCMClientMock(gcm_client_loading_delay_));
-}
-
-} // namespace gcm

Powered by Google App Engine
This is Rietveld 408576698