Refactor webkit_glue::FormField to remove hacky methods

chrome/browser/autofill/autofill_download_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <list>
 
 #include "base/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_download.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_metrics.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/test/base/test_url_request_context_getter.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "webkit/glue/form_data.h"
 
 using webkit_glue::FormData;
+using webkit_glue::FormField;
 using WebKit::WebInputElement;
 
 namespace {
 
 class MockAutofillMetrics : public AutofillMetrics {
  public:
   MockAutofillMetrics() {}
   MOCK_CONST_METHOD1(LogServerQueryMetric, void(ServerQueryMetric metric));
 
  private:
@@ skipping 80 matching lines @@
 typedef TestingBrowserProcessTest AutofillDownloadTest;
 
 TEST_F(AutofillDownloadTest, QueryAndUploadTest) {
   MessageLoopForUI message_loop;
   // Create and register factory.
   AutofillDownloadTestHelper helper;
   TestURLFetcherFactory factory;
 
   FormData form;
   form.method = ASCIIToUTF16("post");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("username"),
-                                               ASCIIToUTF16("username"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
-                                               ASCIIToUTF16("firstname"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
-                                               ASCIIToUTF16("lastname"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("email"),
-                                               ASCIIToUTF16("email"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("email2"),
-                                               ASCIIToUTF16("email2"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("password"),
-                                               ASCIIToUTF16("password"),
-                                               string16(),
-                                               ASCIIToUTF16("password"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(string16(),
-                                               ASCIIToUTF16("Submit"),
-                                               string16(),
-                                               ASCIIToUTF16("submit"),
-                                               0,
-                                               false));
+
+  FormField field;
+  field.label = ASCIIToUTF16("username");

[dhollowa, 2011/08/08 21:40:39]

nit: It would be nice visually to have empty lines separating the logical chunks
(i.e. after each |push_back|).  And below.

[Ilya Sherman, 2011/08/09 00:13:43]

Done.

+  field.name = ASCIIToUTF16("username");
+  field.form_control_type = ASCIIToUTF16("text");
+  form.fields.push_back(field);
+  field.label = ASCIIToUTF16("First Name");
+  field.name = ASCIIToUTF16("firstname");
+  form.fields.push_back(field);
+  field.label = ASCIIToUTF16("Last Name");
+  field.name = ASCIIToUTF16("lastname");
+  form.fields.push_back(field);
+  field.label = ASCIIToUTF16("email");
+  field.name = ASCIIToUTF16("email");
+  form.fields.push_back(field);
+  field.label = ASCIIToUTF16("email2");
+  field.name = ASCIIToUTF16("email2");
+  form.fields.push_back(field);
+  field.label = ASCIIToUTF16("password");
+  field.name = ASCIIToUTF16("password");
+  field.form_control_type = ASCIIToUTF16("password");
+  form.fields.push_back(field);
+  field.label = string16();
+  field.name = ASCIIToUTF16("Submit");
+  field.form_control_type = ASCIIToUTF16("submit");
+  form.fields.push_back(field);
 
   FormStructure *form_structure = new FormStructure(form);
   ScopedVector<FormStructure> form_structures;
   form_structures.push_back(form_structure);
 
   form.fields.clear();
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("address"),
-                                               ASCIIToUTF16("address"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("address2"),
-                                               ASCIIToUTF16("address2"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("city"),
-                                               ASCIIToUTF16("city"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(string16(),
-                                               ASCIIToUTF16("Submit"),
-                                               string16(),
-                                               ASCIIToUTF16("submit"),
-                                               0,
-                                               false));
+  field.label = ASCIIToUTF16("address");
+  field.name = ASCIIToUTF16("address");
+  field.form_control_type = ASCIIToUTF16("text");
+  form.fields.push_back(field);
+  field.label = ASCIIToUTF16("address2");
+  field.name = ASCIIToUTF16("address2");
+  form.fields.push_back(field);
+  field.label = ASCIIToUTF16("city");
+  field.name = ASCIIToUTF16("city");
+  form.fields.push_back(field);
+  field.label = string16();
+  field.name = ASCIIToUTF16("Submit");
+  field.form_control_type = ASCIIToUTF16("submit");
+  form.fields.push_back(field);
   form_structure = new FormStructure(form);
   form_structures.push_back(form_structure);
 
   // Request with id 0.
   MockAutofillMetrics mock_metric_logger;
   EXPECT_CALL(mock_metric_logger,
               LogServerQueryMetric(AutofillMetrics::QUERY_SENT)).Times(2);
   // First one will fail because context is not set up.
   EXPECT_FALSE(helper.download_manager.StartQueryRequest(form_structures,
                                                          mock_metric_logger));
@@ skipping 84 matching lines @@
   EXPECT_FALSE(helper.download_manager.StartUploadRequest(*(form_structures[0]),
                                                           true,
                                                           FieldTypeSet()));
   EXPECT_FALSE(helper.download_manager.StartUploadRequest(*(form_structures[1]),
                                                           false,
                                                           FieldTypeSet()));
   fetcher = factory.GetFetcherByID(3);
   EXPECT_EQ(NULL, fetcher);
 
   // Modify form structures to miss the cache.
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Address line 2"),
-                                               ASCIIToUTF16("address2"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+  field.label = ASCIIToUTF16("Address line 2");
+  field.name = ASCIIToUTF16("address2");
+  field.form_control_type = ASCIIToUTF16("text");
+  form.fields.push_back(field);
   form_structure = new FormStructure(form);
   form_structures.push_back(form_structure);
 
   // Request with id 3.
   EXPECT_CALL(mock_metric_logger,
               LogServerQueryMetric(AutofillMetrics::QUERY_SENT)).Times(1);
   EXPECT_TRUE(helper.download_manager.StartQueryRequest(form_structures,
                                                         mock_metric_logger));
   fetcher = factory.GetFetcherByID(3);
   ASSERT_TRUE(fetcher);
@@ skipping 47 matching lines @@
 
 TEST_F(AutofillDownloadTest, CacheQueryTest) {
   MessageLoopForUI message_loop;
   AutofillDownloadTestHelper helper;
   // Create and register factory.
   TestURLFetcherFactory factory;
   helper.InitContextGetter();
 
   FormData form;
   form.method = ASCIIToUTF16("post");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("username"),
-                                               ASCIIToUTF16("username"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
-                                               ASCIIToUTF16("firstname"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
-                                               ASCIIToUTF16("lastname"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+
+  FormField field;
+  field.label = ASCIIToUTF16("username");
+  field.name = ASCIIToUTF16("username");
+  field.form_control_type = ASCIIToUTF16("text");
+  form.fields.push_back(field);
+  field.label = ASCIIToUTF16("First Name");
+  field.name = ASCIIToUTF16("firstname");
+  form.fields.push_back(field);
+  field.label = ASCIIToUTF16("Last Name");
+  field.name = ASCIIToUTF16("lastname");
+  form.fields.push_back(field);
   FormStructure *form_structure = new FormStructure(form);
   ScopedVector<FormStructure> form_structures0;
   form_structures0.push_back(form_structure);
 
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("email"),
-                                               ASCIIToUTF16("email"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+  field.label = ASCIIToUTF16("email");
+  field.name = ASCIIToUTF16("email");
+  form.fields.push_back(field);
   // Slightly different form - so different request.
   form_structure = new FormStructure(form);
   ScopedVector<FormStructure> form_structures1;
   form_structures1.push_back(form_structure);
 
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("email2"),
-                                               ASCIIToUTF16("email2"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+  field.label = ASCIIToUTF16("email2");
+  field.name = ASCIIToUTF16("email2");
+  form.fields.push_back(field);
   // Slightly different form - so different request.
   form_structure = new FormStructure(form);
   ScopedVector<FormStructure> form_structures2;
   form_structures2.push_back(form_structure);
 
   // Limit cache to two forms.
   helper.LimitCache(2);
 
   const char *responses[] = {
     "<autofillqueryresponse>"
@@ skipping 110 matching lines @@
   fetcher = factory.GetFetcherByID(3);
   ASSERT_TRUE(fetcher);
   fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(),
                                           net::URLRequestStatus(),
                                           200, net::ResponseCookies(),
                                           std::string(responses[0]));
   ASSERT_EQ(static_cast<size_t>(1), helper.responses_.size());
   EXPECT_EQ(responses[0], helper.responses_.front().response);
 }