| Index: chrome/test/base/testing_profile.cc
|
| diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
|
| index 91c14968533c50db51155c202f85b41661ee3278..0e5de26cf2e42c411a8280530a0873eabfe82c38 100644
|
| --- a/chrome/test/base/testing_profile.cc
|
| +++ b/chrome/test/base/testing_profile.cc
|
| @@ -208,12 +208,11 @@ TestingProfile::TestingProfile(
|
| const base::FilePath& path,
|
| Delegate* delegate,
|
| scoped_refptr<ExtensionSpecialStoragePolicy> extension_policy,
|
| - scoped_ptr<PrefServiceSyncable> prefs,
|
| - bool off_the_record)
|
| + scoped_ptr<PrefServiceSyncable> prefs)
|
| : start_time_(Time::Now()),
|
| prefs_(prefs.release()),
|
| testing_prefs_(NULL),
|
| - incognito_(off_the_record),
|
| + incognito_(false),
|
| last_session_exited_cleanly_(true),
|
| extension_special_storage_policy_(extension_policy),
|
| profile_path_(path),
|
| @@ -553,10 +552,6 @@ policy::PolicyService* TestingProfile::GetPolicyService() {
|
| return policy_service_.get();
|
| }
|
|
|
| -void TestingProfile::SetPrefService(PrefServiceSyncable* prefs) {
|
| - prefs_.reset(prefs);
|
| -}
|
| -
|
| void TestingProfile::CreateTestingPrefService() {
|
| DCHECK(!prefs_.get());
|
| testing_prefs_ = new TestingPrefServiceSyncable();
|
| @@ -789,8 +784,7 @@ Profile::ExitType TestingProfile::GetLastSessionExitType() {
|
|
|
| TestingProfile::Builder::Builder()
|
| : build_called_(false),
|
| - delegate_(NULL),
|
| - off_the_record_(false) {
|
| + delegate_(NULL) {
|
| }
|
|
|
| TestingProfile::Builder::~Builder() {
|
| @@ -814,10 +808,6 @@ void TestingProfile::Builder::SetPrefService(
|
| pref_service_ = prefs.Pass();
|
| }
|
|
|
| -void TestingProfile::Builder::SetOffTheRecord() {
|
| - off_the_record_ = true;
|
| -}
|
| -
|
| scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
|
| DCHECK(!build_called_);
|
| build_called_ = true;
|
| @@ -825,6 +815,5 @@ scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
|
| path_,
|
| delegate_,
|
| extension_policy_,
|
| - pref_service_.Pass(),
|
| - off_the_record_));
|
| + pref_service_.Pass()));
|
| }
|
|
|