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

Side by Side Diff: chrome/browser/signin/oauth2_token_service_factory.cc

Issue 11886079: Revert 177136 due to memory error on Mac ASAN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/signin/oauth2_token_service_factory.h" 5 #include "chrome/browser/signin/oauth2_token_service_factory.h"
6 6
7 #include "chrome/browser/profiles/profile_dependency_manager.h" 7 #include "chrome/browser/profiles/profile_dependency_manager.h"
8 #include "chrome/browser/signin/oauth2_token_service.h" 8 #include "chrome/browser/signin/oauth2_token_service.h"
9 #include "chrome/browser/signin/signin_manager_factory.h"
10 #include "chrome/browser/signin/token_service_factory.h" 9 #include "chrome/browser/signin/token_service_factory.h"
11 10
12 OAuth2TokenServiceFactory::OAuth2TokenServiceFactory() 11 OAuth2TokenServiceFactory::OAuth2TokenServiceFactory()
13 : ProfileKeyedServiceFactory("OAuth2TokenService", 12 : ProfileKeyedServiceFactory("OAuth2TokenService",
14 ProfileDependencyManager::GetInstance()) { 13 ProfileDependencyManager::GetInstance()) {
15 DependsOn(SigninManagerFactory::GetInstance());
16 DependsOn(TokenServiceFactory::GetInstance()); 14 DependsOn(TokenServiceFactory::GetInstance());
17 } 15 }
18 16
19 OAuth2TokenServiceFactory::~OAuth2TokenServiceFactory() { 17 OAuth2TokenServiceFactory::~OAuth2TokenServiceFactory() {
20 } 18 }
21 19
22 // static 20 // static
23 OAuth2TokenService* OAuth2TokenServiceFactory::GetForProfile(Profile* profile) { 21 OAuth2TokenService* OAuth2TokenServiceFactory::GetForProfile(Profile* profile) {
24 return static_cast<OAuth2TokenService*>( 22 return static_cast<OAuth2TokenService*>(
25 GetInstance()->GetServiceForProfile(profile, true)); 23 GetInstance()->GetServiceForProfile(profile, true));
26 } 24 }
27 25
28 // static 26 // static
29 OAuth2TokenServiceFactory* OAuth2TokenServiceFactory::GetInstance() { 27 OAuth2TokenServiceFactory* OAuth2TokenServiceFactory::GetInstance() {
30 return Singleton<OAuth2TokenServiceFactory>::get(); 28 return Singleton<OAuth2TokenServiceFactory>::get();
31 } 29 }
32 30
33 ProfileKeyedService* OAuth2TokenServiceFactory::BuildServiceInstanceFor( 31 ProfileKeyedService* OAuth2TokenServiceFactory::BuildServiceInstanceFor(
34 Profile* profile) const { 32 Profile* profile) const {
35 OAuth2TokenService* service = new OAuth2TokenService(); 33 OAuth2TokenService* service = new OAuth2TokenService();
36 service->Initialize(profile); 34 service->Initialize(profile);
37 return service; 35 return service;
38 } 36 }
OLDNEW
« no previous file with comments | « chrome/browser/signin/oauth2_token_service.cc ('k') | chrome/browser/signin/signin_global_error.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698