OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/profile_resetter/profile_resetter_test_base.h" | 5 #include "chrome/browser/profile_resetter/profile_resetter_test_base.h" |
6 | 6 |
7 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" | 7 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" |
8 | 8 |
9 ProfileResetterMockObject::ProfileResetterMockObject() {} | 9 ProfileResetterMockObject::ProfileResetterMockObject() {} |
10 | 10 |
(...skipping 15 matching lines...) Expand all Loading... |
26 ProfileResetterTestBase::ProfileResetterTestBase() {} | 26 ProfileResetterTestBase::ProfileResetterTestBase() {} |
27 | 27 |
28 ProfileResetterTestBase::~ProfileResetterTestBase() {} | 28 ProfileResetterTestBase::~ProfileResetterTestBase() {} |
29 | 29 |
30 void ProfileResetterTestBase::ResetAndWait( | 30 void ProfileResetterTestBase::ResetAndWait( |
31 ProfileResetter::ResettableFlags resettable_flags) { | 31 ProfileResetter::ResettableFlags resettable_flags) { |
32 scoped_ptr<BrandcodedDefaultSettings> master_settings( | 32 scoped_ptr<BrandcodedDefaultSettings> master_settings( |
33 new BrandcodedDefaultSettings); | 33 new BrandcodedDefaultSettings); |
34 resetter_->Reset(resettable_flags, | 34 resetter_->Reset(resettable_flags, |
35 master_settings.Pass(), | 35 master_settings.Pass(), |
| 36 false, |
36 base::Bind(&ProfileResetterMockObject::StopLoop, | 37 base::Bind(&ProfileResetterMockObject::StopLoop, |
37 base::Unretained(&mock_object_))); | 38 base::Unretained(&mock_object_))); |
38 mock_object_.RunLoop(); | 39 mock_object_.RunLoop(); |
39 } | 40 } |
40 | 41 |
41 void ProfileResetterTestBase::ResetAndWait( | 42 void ProfileResetterTestBase::ResetAndWait( |
42 ProfileResetter::ResettableFlags resettable_flags, | 43 ProfileResetter::ResettableFlags resettable_flags, |
43 const std::string& prefs) { | 44 const std::string& prefs) { |
44 scoped_ptr<BrandcodedDefaultSettings> master_settings( | 45 scoped_ptr<BrandcodedDefaultSettings> master_settings( |
45 new BrandcodedDefaultSettings(prefs)); | 46 new BrandcodedDefaultSettings(prefs)); |
46 resetter_->Reset(resettable_flags, | 47 resetter_->Reset(resettable_flags, |
47 master_settings.Pass(), | 48 master_settings.Pass(), |
| 49 false, |
48 base::Bind(&ProfileResetterMockObject::StopLoop, | 50 base::Bind(&ProfileResetterMockObject::StopLoop, |
49 base::Unretained(&mock_object_))); | 51 base::Unretained(&mock_object_))); |
50 mock_object_.RunLoop(); | 52 mock_object_.RunLoop(); |
51 } | 53 } |
OLD | NEW |