| Index: chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc
|
| diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc
|
| index ad6ed0381471744ab052faa4726ff8ae71ac849f..5ffb24ccd04feac38d7edb9cbdf9a870852ed086 100644
|
| --- a/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc
|
| +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc
|
| @@ -100,26 +100,26 @@ class MockProfileResetterDelegate : public AutomaticProfileResetterDelegate {
|
| MOCK_METHOD0(DismissPrompt, void());
|
|
|
| virtual scoped_ptr<base::ListValue>
|
| - GetLoadedModuleNameDigests() const OVERRIDE {
|
| + GetLoadedModuleNameDigests() const override {
|
| OnGetLoadedModuleNameDigestsCalled();
|
| return scoped_ptr<base::ListValue>(
|
| emulated_loaded_module_digests_.DeepCopy());
|
| }
|
|
|
| virtual scoped_ptr<base::DictionaryValue>
|
| - GetDefaultSearchProviderDetails() const OVERRIDE {
|
| + GetDefaultSearchProviderDetails() const override {
|
| OnGetDefaultSearchProviderDetailsCalled();
|
| return scoped_ptr<base::DictionaryValue>(
|
| emulated_default_search_provider_details_.DeepCopy());
|
| }
|
|
|
| - virtual bool IsDefaultSearchProviderManaged() const OVERRIDE {
|
| + virtual bool IsDefaultSearchProviderManaged() const override {
|
| OnIsDefaultSearchProviderManagedCalled();
|
| return emulated_is_default_search_provider_managed_;
|
| }
|
|
|
| virtual scoped_ptr<base::ListValue>
|
| - GetPrepopulatedSearchProvidersDetails() const OVERRIDE {
|
| + GetPrepopulatedSearchProvidersDetails() const override {
|
| OnGetPrepopulatedSearchProvidersDetailsCalled();
|
| return scoped_ptr<base::ListValue>(
|
| emulated_search_providers_details_.DeepCopy());
|
| @@ -515,7 +515,7 @@ class AutomaticProfileResetterTestBase : public testing::Test {
|
| user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| variations::testing::ClearAllVariationParams();
|
| base::FieldTrialList::CreateFieldTrial(kAutomaticProfileResetStudyName,
|
| experiment_group_name_);
|
|
|