Remove the element_ member of FormField, as we don't use it and shouldn't be ...

chrome/browser/webdata/web_database_unittest.cc

 // Copyright (c) 2009 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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/values.h"
@@ skipping 374 matching lines @@
 TEST_F(WebDatabaseTest, Autofill) {
   WebDatabase db;
 
   EXPECT_TRUE(db.Init(file_));
 
   Time t1 = Time::Now();
 
   // Simulate the submission of a handful of entries in a field called "Name",
   // some more often than others.
   EXPECT_TRUE(db.AddFormFieldValue(
-      FormField(NULL,
-                ASCIIToUTF16("Name"),
-                ASCIIToUTF16("Superman"))));
+      FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("Superman"))));
   std::vector<string16> v;
   for (int i = 0; i < 5; i++) {
     EXPECT_TRUE(db.AddFormFieldValue(
-        FormField(NULL,
-                  ASCIIToUTF16("Name"),
-                  ASCIIToUTF16("Clark Kent"))));
+        FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent"))));
   }
   for (int i = 0; i < 3; i++) {
     EXPECT_TRUE(db.AddFormFieldValue(
-        FormField(NULL,
-                  ASCIIToUTF16("Name"),
-                  ASCIIToUTF16("Clark Sutter"))));
+        FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Sutter"))));
   }
   for (int i = 0; i < 2; i++) {
     EXPECT_TRUE(db.AddFormFieldValue(
-        FormField(NULL,
-                  ASCIIToUTF16("Favorite Color"),
-                  ASCIIToUTF16("Green"))));
+        FormField(ASCIIToUTF16("Favorite Color"), ASCIIToUTF16("Green"))));
   }
 
   int count = 0;
   int64 pair_id = 0;
 
   // We have added the name Clark Kent 5 times, so count should be 5 and pair_id
   // should be somthing non-zero.
   EXPECT_TRUE(db.GetIDAndCountOfFormElement(
-      FormField(NULL, ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")),
+      FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")),
       &pair_id, &count));
   EXPECT_EQ(5, count);
   EXPECT_NE(0, pair_id);
 
   // Storing in the data base should be case sensitive, so there should be no
   // database entry for clark kent lowercase.
   EXPECT_TRUE(db.GetIDAndCountOfFormElement(
-      FormField(NULL, ASCIIToUTF16("Name"), ASCIIToUTF16("clark kent")),
+      FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("clark kent")),
       &pair_id, &count));
   EXPECT_EQ(0, count);
 
   EXPECT_TRUE(db.GetIDAndCountOfFormElement(
-      FormField(NULL, ASCIIToUTF16("Favorite Color"), ASCIIToUTF16("Green")),
+      FormField(ASCIIToUTF16("Favorite Color"), ASCIIToUTF16("Green")),
       &pair_id, &count));
   EXPECT_EQ(2, count);
 
   // This is meant to get a list of suggestions for Name.  The empty prefix
   // in the second argument means it should return all suggestions for a name
   // no matter what they start with.  The order that the names occur in the list
   // should be decreasing order by count.
   EXPECT_TRUE(db.GetFormValuesForElementName(
       ASCIIToUTF16("Name"), string16(), &v, 6));
   EXPECT_EQ(3U, v.size());
@@ skipping 20 matching lines @@
   if (v.size() == 2) {
     EXPECT_EQ(ASCIIToUTF16("Clark Kent"), v[0]);
     EXPECT_EQ(ASCIIToUTF16("Clark Sutter"), v[1]);
   }
 
   // Removing all elements since the beginning of this function should remove
   // everything from the database.
   EXPECT_TRUE(db.RemoveFormElementsAddedBetween(t1, Time()));
 
   EXPECT_TRUE(db.GetIDAndCountOfFormElement(
-      FormField(NULL, ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")),
+      FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")),
       &pair_id, &count));
   EXPECT_EQ(0, count);
 
   EXPECT_TRUE(
       db.GetFormValuesForElementName(ASCIIToUTF16("Name"), string16(), &v, 6));
   EXPECT_EQ(0U, v.size());
 
   // Now add some values with empty strings.
   const string16 kValue = ASCIIToUTF16("  toto   ");
-  EXPECT_TRUE(db.AddFormFieldValue(FormField(NULL,
-                                             ASCIIToUTF16("blank"),
+  EXPECT_TRUE(db.AddFormFieldValue(FormField(ASCIIToUTF16("blank"),
                                              string16())));
-  EXPECT_TRUE(db.AddFormFieldValue(FormField(NULL,
-                                             ASCIIToUTF16("blank"),
+  EXPECT_TRUE(db.AddFormFieldValue(FormField(ASCIIToUTF16("blank"),
                                              ASCIIToUTF16(" "))));
-  EXPECT_TRUE(db.AddFormFieldValue(FormField(NULL,
-                                             ASCIIToUTF16("blank"),
+  EXPECT_TRUE(db.AddFormFieldValue(FormField(ASCIIToUTF16("blank"),
                                              ASCIIToUTF16("      "))));
-  EXPECT_TRUE(db.AddFormFieldValue(FormField(NULL,
-                                             ASCIIToUTF16("blank"),
+  EXPECT_TRUE(db.AddFormFieldValue(FormField(ASCIIToUTF16("blank"),
                                              kValue)));
 
   // They should be stored normally as the DB layer does not check for empty
   // values.
   v.clear();
   EXPECT_TRUE(db.GetFormValuesForElementName(
       ASCIIToUTF16("blank"), string16(), &v, 10));
   EXPECT_EQ(4U, v.size());
 
   // Now we'll check that ClearAutofillEmptyValueElements() works as expected.
@@ skipping 194 matching lines @@
     ASSERT_EQ(16, images[0].height());
     ASSERT_EQ(32, images[1].width());
     ASSERT_EQ(32, images[1].height());
   } else {
     ASSERT_EQ(32, images[0].width());
     ASSERT_EQ(32, images[0].height());
     ASSERT_EQ(16, images[1].width());
     ASSERT_EQ(16, images[1].height());
   }
 }