diff options
Diffstat (limited to 'chrome/browser/profile_resetter')
3 files changed, 14 insertions, 15 deletions
diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc index db4ec93..303f030 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc @@ -165,9 +165,9 @@ class AutomaticProfileResetterDelegateTest : public extensions::ExtensionServiceTestBase { protected: AutomaticProfileResetterDelegateTest() {} - virtual ~AutomaticProfileResetterDelegateTest() {} + ~AutomaticProfileResetterDelegateTest() override {} - virtual void SetUp() override { + void SetUp() override { extensions::ExtensionServiceTestBase::SetUp(); ExtensionServiceInitParams params = CreateDefaultInitParams(); params.pref_file.clear(); // Prescribes a TestingPrefService to be created. @@ -178,7 +178,7 @@ class AutomaticProfileResetterDelegateTest new AutomaticProfileResetterDelegateUnderTest(profile())); } - virtual void TearDown() override { + void TearDown() override { resetter_delegate_.reset(); template_url_service_test_util_.reset(); extensions::ExtensionServiceTestBase::TearDown(); diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc index 135094f..d900b40 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc @@ -62,7 +62,7 @@ class AutomaticProfileResetterUnderTest : public AutomaticProfileResetter { public: explicit AutomaticProfileResetterUnderTest(Profile* profile) : AutomaticProfileResetter(profile) {} - virtual ~AutomaticProfileResetterUnderTest() {} + ~AutomaticProfileResetterUnderTest() override {} MOCK_METHOD2(ReportStatistics, void(uint32, uint32)); MOCK_METHOD1(ReportPromptResult, @@ -76,7 +76,7 @@ class MockProfileResetterDelegate : public AutomaticProfileResetterDelegate { public: MockProfileResetterDelegate() : emulated_is_default_search_provider_managed_(false) {} - virtual ~MockProfileResetterDelegate() {} + ~MockProfileResetterDelegate() override {} MOCK_METHOD0(EnumerateLoadedModulesIfNeeded, void()); MOCK_CONST_METHOD1(RequestCallbackWhenLoadedModulesAreEnumerated, @@ -99,26 +99,25 @@ class MockProfileResetterDelegate : public AutomaticProfileResetterDelegate { MOCK_METHOD2(TriggerProfileSettingsReset, void(bool, const base::Closure&)); MOCK_METHOD0(DismissPrompt, void()); - virtual scoped_ptr<base::ListValue> - GetLoadedModuleNameDigests() const override { + scoped_ptr<base::ListValue> GetLoadedModuleNameDigests() const override { OnGetLoadedModuleNameDigestsCalled(); return scoped_ptr<base::ListValue>( emulated_loaded_module_digests_.DeepCopy()); } - virtual scoped_ptr<base::DictionaryValue> + scoped_ptr<base::DictionaryValue> GetDefaultSearchProviderDetails() const override { OnGetDefaultSearchProviderDetailsCalled(); return scoped_ptr<base::DictionaryValue>( emulated_default_search_provider_details_.DeepCopy()); } - virtual bool IsDefaultSearchProviderManaged() const override { + bool IsDefaultSearchProviderManaged() const override { OnIsDefaultSearchProviderManagedCalled(); return emulated_is_default_search_provider_managed_; } - virtual scoped_ptr<base::ListValue> + scoped_ptr<base::ListValue> GetPrepopulatedSearchProvidersDetails() const override { OnGetPrepopulatedSearchProvidersDetailsCalled(); return scoped_ptr<base::ListValue>( @@ -515,7 +514,7 @@ class AutomaticProfileResetterTestBase : public testing::Test { user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); } - virtual void SetUp() override { + void SetUp() override { variations::testing::ClearAllVariationParams(); base::FieldTrialList::CreateFieldTrial(kAutomaticProfileResetStudyName, experiment_group_name_); diff --git a/chrome/browser/profile_resetter/jtl_interpreter.cc b/chrome/browser/profile_resetter/jtl_interpreter.cc index c918954..be0b368 100644 --- a/chrome/browser/profile_resetter/jtl_interpreter.cc +++ b/chrome/browser/profile_resetter/jtl_interpreter.cc @@ -246,8 +246,8 @@ class StoreNodeValue : public Operation { : hashed_name_(hashed_name) { DCHECK(base::IsStringUTF8(hashed_name)); } - virtual ~StoreNodeValue() {} - virtual bool Execute(ExecutionContext* context) override { + ~StoreNodeValue() override {} + bool Execute(ExecutionContext* context) override { scoped_ptr<base::Value> value; if (ExpectedTypeIsBooleanNotHashable) { if (!context->current_node()->IsType(base::Value::TYPE_BOOLEAN)) @@ -382,8 +382,8 @@ class CompareNodeToStored : public Operation { public: explicit CompareNodeToStored(const std::string& hashed_name) : hashed_name_(hashed_name) {} - virtual ~CompareNodeToStored() {} - virtual bool Execute(ExecutionContext* context) override { + ~CompareNodeToStored() override {} + bool Execute(ExecutionContext* context) override { const base::Value* stored_value = NULL; if (!context->working_memory()->Get(hashed_name_, &stored_value)) return true; |