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

Unified Diff: google_apis/gaia/ubertoken_fetcher.cc

Issue 136723009: Move UbertokenFetcher from //chrome to //google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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 | « google_apis/gaia/ubertoken_fetcher.h ('k') | google_apis/gaia/ubertoken_fetcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/gaia/ubertoken_fetcher.cc
diff --git a/chrome/browser/signin/ubertoken_fetcher.cc b/google_apis/gaia/ubertoken_fetcher.cc
similarity index 70%
rename from chrome/browser/signin/ubertoken_fetcher.cc
rename to google_apis/gaia/ubertoken_fetcher.cc
index ef195915c58267be52d6bc338710891be2d7fe6d..16e8811a56758d292644901d4656ff38e6b4c2c6 100644
--- a/chrome/browser/signin/ubertoken_fetcher.cc
+++ b/google_apis/gaia/ubertoken_fetcher.cc
@@ -2,26 +2,28 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/signin/ubertoken_fetcher.h"
+#include "google_apis/gaia/ubertoken_fetcher.h"
#include <vector>
#include "base/logging.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/profile_oauth2_token_service.h"
-#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "google_apis/gaia/gaia_auth_fetcher.h"
#include "google_apis/gaia/gaia_constants.h"
#include "google_apis/gaia/gaia_urls.h"
#include "google_apis/gaia/google_service_auth_error.h"
#include "google_apis/gaia/oauth2_token_service.h"
-UbertokenFetcher::UbertokenFetcher(Profile* profile,
- UbertokenConsumer* consumer)
+UbertokenFetcher::UbertokenFetcher(
+ OAuth2TokenService* token_service,
+ UbertokenConsumer* consumer,
+ net::URLRequestContextGetter* request_context)
: OAuth2TokenService::Consumer("uber_token_fetcher"),
- profile_(profile), consumer_(consumer) {
- DCHECK(profile);
+ token_service_(token_service),
+ consumer_(consumer),
+ request_context_(request_context) {
+ DCHECK(token_service);
DCHECK(consumer);
+ DCHECK(request_context);
}
UbertokenFetcher::~UbertokenFetcher() {
@@ -30,9 +32,8 @@ UbertokenFetcher::~UbertokenFetcher() {
void UbertokenFetcher::StartFetchingToken(const std::string& account_id) {
OAuth2TokenService::ScopeSet scopes;
scopes.insert(GaiaUrls::GetInstance()->oauth1_login_scope());
- OAuth2TokenService* token_service =
- ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
- access_token_request_ = token_service->StartRequest(account_id, scopes, this);
+ access_token_request_ =
+ token_service_->StartRequest(account_id, scopes, this);
}
void UbertokenFetcher::OnUberAuthTokenSuccess(const std::string& token) {
@@ -51,7 +52,7 @@ void UbertokenFetcher::OnGetTokenSuccess(
access_token_request_.reset();
gaia_auth_fetcher_.reset(new GaiaAuthFetcher(this,
GaiaConstants::kChromeSource,
- profile_->GetRequestContext()));
+ request_context_));
gaia_auth_fetcher_->StartTokenFetchForUberAuthExchange(access_token);
}
« no previous file with comments | « google_apis/gaia/ubertoken_fetcher.h ('k') | google_apis/gaia/ubertoken_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698