summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autofill/autofill_merge_unittest.cc
diff options
context:
space:
mode:
authorblundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-05 01:29:14 +0000
committerblundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-05 01:29:14 +0000
commit1ecbe866c38fb6c781d337393b7ff62d0c662f4e (patch)
tree37ddf68241e68df9035f2c612388369f1539fe4d /chrome/browser/autofill/autofill_merge_unittest.cc
parent456cface8888f0e39742243f25295d55c8922744 (diff)
downloadchromium_src-1ecbe866c38fb6c781d337393b7ff62d0c662f4e.zip
chromium_src-1ecbe866c38fb6c781d337393b7ff62d0c662f4e.tar.gz
chromium_src-1ecbe866c38fb6c781d337393b7ff62d0c662f4e.tar.bz2
Move forms/ out of webkit/.
The motivation for this CL is to move PasswordForm and friends (which are totally unrelated to WebKit) out of webkit/ and into a target that platforms that do not use WebKit (such as iOS) can logically depend on. As such, this CL does three things: 1. Separates the WebKit-related code in webkit/forms from the non-WebKit-related code. Concretely, this means having the WebKit::WebFormElement->PasswordForm conversion function in its own file. 2. Moves the core, non-WebKit-related forms code to chrome/common and content/public/common depending on where its usage points are. 3. Moves the above-mentioned conversion function to content/public/renderer. It cannot stay in webkit/ as it (now) has a dependency on content/, and as it is used only in chrome/renderer and content/renderer, this is a good place for it. The rest of this CL is churn due to namespace, file location, and GYP target changes. BUG= Review URL: https://chromiumcodereview.appspot.com/11000016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autofill/autofill_merge_unittest.cc')
-rw-r--r--chrome/browser/autofill/autofill_merge_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/autofill/autofill_merge_unittest.cc b/chrome/browser/autofill/autofill_merge_unittest.cc
index 83430f4..2e51e2d 100644
--- a/chrome/browser/autofill/autofill_merge_unittest.cc
+++ b/chrome/browser/autofill/autofill_merge_unittest.cc
@@ -13,10 +13,10 @@
#include "chrome/browser/autofill/data_driven_test.h"
#include "chrome/browser/autofill/form_structure.h"
#include "chrome/browser/autofill/personal_data_manager.h"
+#include "chrome/common/form_data.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
-#include "webkit/forms/form_data.h"
namespace {
@@ -155,7 +155,7 @@ void AutofillMergeTest::MergeProfiles(const std::string& profiles,
personal_data_.Reset();
// Create a test form.
- webkit::forms::FormData form;
+ FormData form;
form.name = ASCIIToUTF16("MyTestForm");
form.method = ASCIIToUTF16("POST");
form.origin = GURL("https://www.example.com/origin.html");
@@ -175,7 +175,7 @@ void AutofillMergeTest::MergeProfiles(const std::string& profiles,
string16 field_type = UTF8ToUTF16(line.substr(0, separator_pos));
string16 value = UTF8ToUTF16(line.substr(separator_pos + kFieldOffset));
- webkit::forms::FormField field;
+ FormFieldData field;
field.label = field_type;
field.name = field_type;
field.value = value;