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

Side by Side Diff: chrome/test/base/testing_profile.cc

Issue 11620012: [Profiles, Fixit] Making GAIAInfoUpdateService into a ProfileKeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing RegisterUserPrefs Created 8 years 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/test/base/testing_profile.h" 5 #include "chrome/test/base/testing_profile.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 } 494 }
495 495
496 void TestingProfile::SetOffTheRecordProfile(Profile* profile) { 496 void TestingProfile::SetOffTheRecordProfile(Profile* profile) {
497 incognito_profile_.reset(profile); 497 incognito_profile_.reset(profile);
498 } 498 }
499 499
500 Profile* TestingProfile::GetOffTheRecordProfile() { 500 Profile* TestingProfile::GetOffTheRecordProfile() {
501 return incognito_profile_.get(); 501 return incognito_profile_.get();
502 } 502 }
503 503
504 GAIAInfoUpdateService* TestingProfile::GetGAIAInfoUpdateService() {
505 return NULL;
506 }
507
508 bool TestingProfile::HasOffTheRecordProfile() { 504 bool TestingProfile::HasOffTheRecordProfile() {
509 return incognito_profile_.get() != NULL; 505 return incognito_profile_.get() != NULL;
510 } 506 }
511 507
512 Profile* TestingProfile::GetOriginalProfile() { 508 Profile* TestingProfile::GetOriginalProfile() {
513 return this; 509 return this;
514 } 510 }
515 511
516 ExtensionService* TestingProfile::GetExtensionService() { 512 ExtensionService* TestingProfile::GetExtensionService() {
517 return extensions::ExtensionSystem::Get(this)->extension_service(); 513 return extensions::ExtensionSystem::Get(this)->extension_service();
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 795
800 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() { 796 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
801 DCHECK(!build_called_); 797 DCHECK(!build_called_);
802 build_called_ = true; 798 build_called_ = true;
803 return scoped_ptr<TestingProfile>(new TestingProfile( 799 return scoped_ptr<TestingProfile>(new TestingProfile(
804 path_, 800 path_,
805 delegate_, 801 delegate_,
806 extension_policy_, 802 extension_policy_,
807 pref_service_.Pass())); 803 pref_service_.Pass()));
808 } 804 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698