| 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/string_util.h" |    9 #include "base/string_util.h" | 
|   10 #include "base/utf_string_conversions.h" |   10 #include "base/utf_string_conversions.h" | 
|   11 #include "chrome/browser/autofill/autofill_common_test.h" |   11 #include "chrome/browser/autofill/autofill_common_test.h" | 
|   12 #include "chrome/browser/autofill/autofill_type.h" |   12 #include "chrome/browser/autofill/autofill_type.h" | 
|   13 #include "chrome/browser/autofill/data_driven_test.h" |   13 #include "chrome/browser/autofill/data_driven_test.h" | 
|   14 #include "chrome/browser/autofill/form_structure.h" |   14 #include "chrome/browser/autofill/form_structure.h" | 
|   15 #include "chrome/browser/autofill/personal_data_manager.h" |   15 #include "chrome/browser/autofill/personal_data_manager.h" | 
|   16 #include "chrome/common/form_data.h" |   16 #include "components/autofill/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 { |   21 namespace { | 
|   22  |   22  | 
|   23 const base::FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge"); |   23 const base::FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge"); | 
|   24 const base::FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in"); |   24 const base::FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in"); | 
|   25  |   25  | 
|   26 const char kFieldSeparator[] = ": "; |   26 const char kFieldSeparator[] = ": "; | 
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  208     } |  208     } | 
|  209   } |  209   } | 
|  210  |  210  | 
|  211   *merged_profiles = SerializeProfiles(personal_data_.web_profiles()); |  211   *merged_profiles = SerializeProfiles(personal_data_.web_profiles()); | 
|  212 } |  212 } | 
|  213  |  213  | 
|  214 TEST_F(AutofillMergeTest, DataDrivenMergeProfiles) { |  214 TEST_F(AutofillMergeTest, DataDrivenMergeProfiles) { | 
|  215   RunDataDrivenTest(GetInputDirectory(kTestName), GetOutputDirectory(kTestName), |  215   RunDataDrivenTest(GetInputDirectory(kTestName), GetOutputDirectory(kTestName), | 
|  216                     kFileNamePattern); |  216                     kFileNamePattern); | 
|  217 } |  217 } | 
| OLD | NEW |