Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: components/autofill/core/browser/autofill_merge_unittest.cc

Issue 2740633002: [Autofill] Add upstreaming UKM (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <map> 7 #include <map>
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 std::string SaveImportedProfile(const AutofillProfile& profile) override; 119 std::string SaveImportedProfile(const AutofillProfile& profile) override;
120 std::vector<AutofillProfile*> web_profiles() const override; 120 std::vector<AutofillProfile*> web_profiles() const override;
121 121
122 private: 122 private:
123 std::vector<std::unique_ptr<AutofillProfile>> profiles_; 123 std::vector<std::unique_ptr<AutofillProfile>> profiles_;
124 124
125 DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerMock); 125 DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerMock);
126 }; 126 };
127 127
128 PersonalDataManagerMock::PersonalDataManagerMock() 128 PersonalDataManagerMock::PersonalDataManagerMock()
129 : PersonalDataManager("en-US") { 129 : PersonalDataManager("en-US", nullptr /* ukm_service */) {}
130 }
131 130
132 PersonalDataManagerMock::~PersonalDataManagerMock() { 131 PersonalDataManagerMock::~PersonalDataManagerMock() {
133 } 132 }
134 133
135 void PersonalDataManagerMock::Reset() { 134 void PersonalDataManagerMock::Reset() {
136 profiles_.clear(); 135 profiles_.clear();
137 } 136 }
138 137
139 std::string PersonalDataManagerMock::SaveImportedProfile( 138 std::string PersonalDataManagerMock::SaveImportedProfile(
140 const AutofillProfile& profile) { 139 const AutofillProfile& profile) {
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 return string_to_field_type_map_[str]; 286 return string_to_field_type_map_[str];
288 } 287 }
289 288
290 TEST_P(AutofillMergeTest, DataDrivenMergeProfiles) { 289 TEST_P(AutofillMergeTest, DataDrivenMergeProfiles) {
291 RunOneDataDrivenTest(GetParam(), GetOutputDirectory(kTestName)); 290 RunOneDataDrivenTest(GetParam(), GetOutputDirectory(kTestName));
292 } 291 }
293 292
294 INSTANTIATE_TEST_CASE_P(, AutofillMergeTest, testing::ValuesIn(GetTestFiles())); 293 INSTANTIATE_TEST_CASE_P(, AutofillMergeTest, testing::ValuesIn(GetTestFiles()));
295 294
296 } // namespace autofill 295 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698