Reduce boxing and unboxing of AutofillFieldType

chrome/browser/webdata/web_data_service_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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 304 matching lines @@
   // Check that it was removed.
   AutofillWebDataServiceConsumer<std::vector<AutofillProfile*> > consumer2;
   WebDataService::Handle handle2 = wds_->GetAutofillProfiles(&consumer2);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle2, consumer2.handle());
   ASSERT_EQ(0U, consumer2.result().size());
 }
 
 TEST_F(WebDataServiceAutofillTest, ProfileUpdate) {
   AutofillProfile profile1;
-  profile1.SetInfo(AutofillType(NAME_FIRST), ASCIIToUTF16("Abe"));
+  profile1.SetInfo(NAME_FIRST, ASCIIToUTF16("Abe"));
   AutofillProfile profile2;
-  profile2.SetInfo(AutofillType(NAME_FIRST), ASCIIToUTF16("Alice"));
+  profile2.SetInfo(NAME_FIRST, ASCIIToUTF16("Alice"));
 
   EXPECT_CALL(*observer_helper_->observer(), Observe(_, _, _)).
       WillOnce(DoDefault()).
       WillOnce(SignalEvent(&done_event_));
   wds_->AddAutofillProfile(profile1);
   wds_->AddAutofillProfile(profile2);
   done_event_.TimedWait(test_timeout_);
 
   // Check that they were added.
   AutofillWebDataServiceConsumer<std::vector<AutofillProfile*> > consumer;
   WebDataService::Handle handle = wds_->GetAutofillProfiles(&consumer);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle, consumer.handle());
   ASSERT_EQ(2U, consumer.result().size());
   EXPECT_EQ(profile1, *consumer.result()[0]);
   EXPECT_EQ(profile2, *consumer.result()[1]);
   STLDeleteElements(&consumer.result());
 
   AutofillProfile profile1_changed(profile1);
-  profile1_changed.SetInfo(AutofillType(NAME_FIRST), ASCIIToUTF16("Bill"));
+  profile1_changed.SetInfo(NAME_FIRST, ASCIIToUTF16("Bill"));
   const AutofillProfileChange expected_change(
       AutofillProfileChange::UPDATE, profile1.guid(), &profile1_changed);
 
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(NotificationType(NotificationType::AUTOFILL_PROFILE_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillProfileChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
@@ skipping 76 matching lines @@
   // Check that it was removed.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > consumer2;
   WebDataService::Handle handle2 = wds_->GetCreditCards(&consumer2);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle2, consumer2.handle());
   ASSERT_EQ(0U, consumer2.result().size());
 }
 
 TEST_F(WebDataServiceAutofillTest, CreditUpdate) {
   CreditCard card1;
-  card1.SetInfo(AutofillType(CREDIT_CARD_NAME), ASCIIToUTF16("Abe"));
+  card1.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Abe"));
   CreditCard card2;
-  card2.SetInfo(AutofillType(CREDIT_CARD_NAME), ASCIIToUTF16("Alice"));
+  card2.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Alice"));
 
   EXPECT_CALL(*observer_helper_->observer(), Observe(_, _, _)).
       Times(2).
       WillOnce(DoDefault()).
       WillOnce(SignalEvent(&done_event_));
   wds_->AddCreditCard(card1);
   wds_->AddCreditCard(card2);
   done_event_.TimedWait(test_timeout_);
 
   // Check that they got added.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > consumer;
   WebDataService::Handle handle = wds_->GetCreditCards(&consumer);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle, consumer.handle());
   ASSERT_EQ(2U, consumer.result().size());
   EXPECT_EQ(card1, *consumer.result()[0]);
   EXPECT_EQ(card2, *consumer.result()[1]);
   STLDeleteElements(&consumer.result());
 
   CreditCard card1_changed(card1);
-  card1_changed.SetInfo(AutofillType(CREDIT_CARD_NAME), ASCIIToUTF16("Bill"));
+  card1_changed.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Bill"));
   const AutofillCreditCardChange expected_change(
       AutofillCreditCardChange::UPDATE, card1.guid(), &card1_changed);
 
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(
           NotificationType(NotificationType::AUTOFILL_CREDIT_CARD_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillCreditCardChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   wds_->UpdateCreditCard(card1_changed);
   done_event_.TimedWait(test_timeout_);
 
   // Check that the updates were made.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > consumer2;
   WebDataService::Handle handle2 = wds_->GetCreditCards(&consumer2);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle2, consumer2.handle());
   ASSERT_EQ(2U, consumer2.result().size());
   EXPECT_NE(card1, *consumer2.result()[0]);
   EXPECT_EQ(card1_changed, *consumer2.result()[0]);
   EXPECT_EQ(card2, *consumer2.result()[1]);
   STLDeleteElements(&consumer2.result());
 }