Cleanup: Order the methods in WebDataService. Rename a method to match current style.

chrome/browser/webdata/web_data_service_unittest.cc

 // Copyright (c) 2010 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 <vector>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 206 matching lines @@
       *observer_helper_->observer(),
       Observe(NotificationType(NotificationType::AUTOFILL_ENTRIES_CHANGED),
               NotificationService::AllSources(),
               Property(&Details<const AutofillChangeList>::ptr,
                        Pointee(ElementsAreArray(expected_changes))))).
       WillOnce(SignalEvent(&done_event_));
 
   std::vector<webkit_glue::FormField> form_fields;
   AppendFormField(name1_, value1_, &form_fields);
   AppendFormField(name2_, value2_, &form_fields);
-  wds_->AddFormFieldValues(form_fields);
+  wds_->AddFormFields(form_fields);
 
   // The event will be signaled when the mock observer is notified.
   done_event_.TimedWait(test_timeout_);
 
   AutofillWebDataServiceConsumer consumer;
   WebDataService::Handle handle;
   static const int limit = 10;
   handle = wds_->GetFormValuesForElementName(
       name1_, string16(), limit, &consumer);
 
   // The message loop will exit when the consumer is called.
   MessageLoop::current()->Run();
 
   EXPECT_EQ(handle, consumer.handle());
   ASSERT_EQ(1U, consumer.values().size());
   EXPECT_EQ(value1_, consumer.values()[0]);
 }
 
 TEST_F(WebDataServiceAutofillTest, FormFillRemoveOne) {
   // First add some values to autofill.
   EXPECT_CALL(*observer_helper_->observer(), Observe(_, _, _)).
       WillOnce(SignalEvent(&done_event_));
   std::vector<webkit_glue::FormField> form_fields;
   AppendFormField(name1_, value1_, &form_fields);
-  wds_->AddFormFieldValues(form_fields);
+  wds_->AddFormFields(form_fields);
 
   // The event will be signaled when the mock observer is notified.
   done_event_.TimedWait(test_timeout_);
 
   // This will verify that the correct notification is triggered,
   // passing the correct list of autofill keys in the details.
   const AutofillChange expected_changes[] = {
     AutofillChange(AutofillChange::REMOVE, AutofillKey(name1_, value1_))
   };
   EXPECT_CALL(
@@ skipping 11 matching lines @@
 
 TEST_F(WebDataServiceAutofillTest,FormFillRemoveMany) {
   TimeDelta one_day(TimeDelta::FromDays(1));
   Time t = Time::Now();
 
   EXPECT_CALL(*observer_helper_->observer(), Observe(_, _, _)).
       WillOnce(SignalEvent(&done_event_));
   std::vector<webkit_glue::FormField> form_fields;
   AppendFormField(name1_, value1_, &form_fields);
   AppendFormField(name2_, value2_, &form_fields);
-  wds_->AddFormFieldValues(form_fields);
+  wds_->AddFormFields(form_fields);
 
   // The event will be signaled when the mock observer is notified.
   done_event_.TimedWait(test_timeout_);
 
   // This will verify that the correct notification is triggered,
   // passing the correct list of autofill keys in the details.
   const AutofillChange expected_changes[] = {
     AutofillChange(AutofillChange::REMOVE, AutofillKey(name1_, value1_)),
     AutofillChange(AutofillChange::REMOVE, AutofillKey(name2_, value2_))
   };
@@ skipping 141 matching lines @@
       Observe(NotificationType(NotificationType::AUTOFILL_CREDIT_CARD_CHANGED),
               NotificationService::AllSources(),
               Property(&Details<const AutofillCreditCardChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   wds_->UpdateCreditCard(card1_delta);
   done_event_.TimedWait(test_timeout_);
 }