components/autofill/core/browser/autofill_merge_unittest.cc - Issue 17392006: In components/autofill, move browser/ to core/browser/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 17392006: In components/autofill, move browser/ to core/browser/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to fix conflicts Created 7 years, 6 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 | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 <vector>	5 #include <vector>

6	6

7 #include "base/basictypes.h"	7 #include "base/basictypes.h"

8 #include "base/files/file_path.h"	8 #include "base/files/file_path.h"

9 #include "base/strings/string_util.h"	9 #include "base/strings/string_util.h"

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

11 #include "components/autofill/browser/autofill_common_test.h"	11 #include "components/autofill/core/browser/autofill_common_test.h"

12 #include "components/autofill/browser/autofill_type.h"	12 #include "components/autofill/core/browser/autofill_type.h"

13 #include "components/autofill/browser/data_driven_test.h"	13 #include "components/autofill/core/browser/data_driven_test.h"

14 #include "components/autofill/browser/form_structure.h"	14 #include "components/autofill/core/browser/form_structure.h"

15 #include "components/autofill/browser/personal_data_manager.h"	15 #include "components/autofill/core/browser/personal_data_manager.h"

16 #include "components/autofill/core/common/form_data.h"	16 #include "components/autofill/core/common/form_data.h"

17 #include "googleurl/src/gurl.h"	17 #include "googleurl/src/gurl.h"

18 #include "testing/gtest/include/gtest/gtest.h"	18 #include "testing/gtest/include/gtest/gtest.h"

19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"	19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"

20	20

21 namespace autofill {	21 namespace autofill {

22	22

23 namespace {	23 namespace {

24	24

25 const base::FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");	25 const base::FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");

(...skipping 188 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
214	214

215 *merged_profiles = SerializeProfiles(personal_data_.web_profiles());	215 *merged_profiles = SerializeProfiles(personal_data_.web_profiles());

216 }	216 }

217	217

218 TEST_F(AutofillMergeTest, DataDrivenMergeProfiles) {	218 TEST_F(AutofillMergeTest, DataDrivenMergeProfiles) {

219 RunDataDrivenTest(GetInputDirectory(kTestName), GetOutputDirectory(kTestName),	219 RunDataDrivenTest(GetInputDirectory(kTestName), GetOutputDirectory(kTestName),

220 kFileNamePattern);	220 kFileNamePattern);

221 }	221 }

222	222

223 } // namespace autofill	223 } // namespace autofill

OLD	NEW