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

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

Issue 1970833002: Fix include path for moved thread_task_runner_handle.h header in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393009 Created 4 years, 7 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 "components/autofill/core/browser/personal_data_manager.h" 5 #include "components/autofill/core/browser/personal_data_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/files/scoped_temp_dir.h" 15 #include "base/files/scoped_temp_dir.h"
16 #include "base/guid.h" 16 #include "base/guid.h"
17 #include "base/metrics/field_trial.h" 17 #include "base/metrics/field_trial.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "base/synchronization/waitable_event.h" 19 #include "base/synchronization/waitable_event.h"
20 #include "base/thread_task_runner_handle.h" 20 #include "base/threading/thread_task_runner_handle.h"
21 #include "base/time/time.h" 21 #include "base/time/time.h"
22 #include "build/build_config.h" 22 #include "build/build_config.h"
23 #include "components/autofill/core/browser/autofill_experiments.h" 23 #include "components/autofill/core/browser/autofill_experiments.h"
24 #include "components/autofill/core/browser/autofill_profile.h" 24 #include "components/autofill/core/browser/autofill_profile.h"
25 #include "components/autofill/core/browser/autofill_test_utils.h" 25 #include "components/autofill/core/browser/autofill_test_utils.h"
26 #include "components/autofill/core/browser/field_types.h" 26 #include "components/autofill/core/browser/field_types.h"
27 #include "components/autofill/core/browser/form_structure.h" 27 #include "components/autofill/core/browser/form_structure.h"
28 #include "components/autofill/core/browser/personal_data_manager_observer.h" 28 #include "components/autofill/core/browser/personal_data_manager_observer.h"
29 #include "components/autofill/core/browser/webdata/autofill_table.h" 29 #include "components/autofill/core/browser/webdata/autofill_table.h"
30 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" 30 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
(...skipping 4171 matching lines...) Expand 10 before | Expand all | Expand 10 after
4202 // Merge the imported profile into the existing profiles. 4202 // Merge the imported profile into the existing profiles.
4203 std::vector<AutofillProfile> profiles; 4203 std::vector<AutofillProfile> profiles;
4204 std::string guid = personal_data_->MergeProfile( 4204 std::string guid = personal_data_->MergeProfile(
4205 imported_profile, existing_profiles, "US-EN", &profiles); 4205 imported_profile, existing_profiles, "US-EN", &profiles);
4206 4206
4207 // The new profile should be merged into the "fox" profile. 4207 // The new profile should be merged into the "fox" profile.
4208 EXPECT_EQ(profile2.guid(), guid); 4208 EXPECT_EQ(profile2.guid(), guid);
4209 } 4209 }
4210 4210
4211 } // namespace autofill 4211 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698