| Index: components/autofill/core/browser/autofill_merge_unittest.cc
|
| diff --git a/components/autofill/core/browser/autofill_merge_unittest.cc b/components/autofill/core/browser/autofill_merge_unittest.cc
|
| index 08fbd22353c41288b9b545f29f3ce9ff16572ff3..5ab2057483e3525c40daad7c8ed73b4c8b906a99 100644
|
| --- a/components/autofill/core/browser/autofill_merge_unittest.cc
|
| +++ b/components/autofill/core/browser/autofill_merge_unittest.cc
|
| @@ -81,15 +81,14 @@ std::string SerializeProfiles(const std::vector<AutofillProfile*>& profiles) {
|
| class PersonalDataManagerMock : public PersonalDataManager {
|
| public:
|
| PersonalDataManagerMock();
|
| - virtual ~PersonalDataManagerMock();
|
| + ~PersonalDataManagerMock() override;
|
|
|
| // Reset the saved profiles.
|
| void Reset();
|
|
|
| // PersonalDataManager:
|
| - virtual std::string SaveImportedProfile(
|
| - const AutofillProfile& profile) override;
|
| - virtual const std::vector<AutofillProfile*>& web_profiles() const override;
|
| + std::string SaveImportedProfile(const AutofillProfile& profile) override;
|
| + const std::vector<AutofillProfile*>& web_profiles() const override;
|
|
|
| private:
|
| ScopedVector<AutofillProfile> profiles_;
|
| @@ -140,8 +139,7 @@ class AutofillMergeTest : public testing::Test,
|
| virtual void SetUp();
|
|
|
| // DataDrivenTest:
|
| - virtual void GenerateResults(const std::string& input,
|
| - std::string* output) override;
|
| + void GenerateResults(const std::string& input, std::string* output) override;
|
|
|
| // Deserializes a set of Autofill profiles from |profiles|, imports each
|
| // sequentially, and fills |merged_profiles| with the serialized result.
|
|
|