These changes *are* for review :)

chrome/browser/autofill/autofill_manager_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 <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
@@ skipping 1861 matching lines @@
       "Phone Extension", "ext", "", "text", &field);
   field.max_length = 3;
   form.fields.push_back(field);
 
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
   AutofillProfile *work_profile = autofill_manager_->GetProfileWithGUID(
       "00000000-0000-0000-0000-000000000002");
   ASSERT_TRUE(work_profile != NULL);
-  string16 saved_phone = work_profile->GetInfo(PHONE_HOME_NUMBER);
+  string16 saved_phone = work_profile->GetInfo(PHONE_HOME_WHOLE_NUMBER);

[dhollowa, 2011/05/13 18:55:35]

It looks like this |save_phone| is unneeded.  It is used again at line 1912, but
never checked.  And |work_profile| is reset for the next test in the |SetUp|
call.  Let's remove this unused logic.

[GeorgeY, 2011/05/18 17:41:45]

Done.

 
   GUIDPair guid(work_profile->guid(), 0);
   GUIDPair empty(std::string(), 0);
 
-  char test_data[] = "1234567890123456";
+  char test_data[] = "16505554567890123456";
   for (int i = arraysize(test_data) - 1; i >= 0; --i) {
     test_data[i] = 0;
     SCOPED_TRACE(StringPrintf("Testing phone: %s", test_data));
-    work_profile->SetInfo(PHONE_HOME_NUMBER, ASCIIToUTF16(test_data));
+    work_profile->SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16(test_data));
     // The page ID sent to the AutofillManager from the RenderView, used to send
     // an IPC message back to the renderer.
     int page_id = 100 - i;
     FillAutofillFormData(
         page_id, form, *form.fields.begin(),
         autofill_manager_->PackGUIDs(empty, guid));
     page_id = 0;
     FormData results;
     EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
 
-    if (i != 7) {
-      EXPECT_EQ(ASCIIToUTF16(test_data), results.fields[2].value);
-      EXPECT_EQ(ASCIIToUTF16(test_data), results.fields[3].value);
+    if (i != 11) {
+      // The only parsable phone is 16505554567.
+      EXPECT_EQ(string16(), results.fields[2].value);
+      EXPECT_EQ(string16(), results.fields[3].value);
     } else {
-      // The only size that is parsed and split, right now is 7:
-      EXPECT_EQ(ASCIIToUTF16("123"), results.fields[2].value);
+      EXPECT_EQ(ASCIIToUTF16("555"), results.fields[2].value);
       EXPECT_EQ(ASCIIToUTF16("4567"), results.fields[3].value);
     }
   }
 
-  work_profile->SetInfo(PHONE_HOME_NUMBER, saved_phone);
+  work_profile->SetInfo(PHONE_HOME_WHOLE_NUMBER, saved_phone);
 }
 
 // Test that we can still fill a form when a field has been removed from it.
 TEST_F(AutofillManagerTest, FormChangesRemoveField) {
   // Set up our form data.
   FormData form;
   CreateTestAddressFormData(&form);
 
   // Add a field -- we'll remove it again later.
   FormField field;
@@ skipping 129 matching lines @@
 #else
   ASSERT_FALSE(profile()->GetPrefs()->GetBoolean(
       prefs::kAutofillAuxiliaryProfilesEnabled));
   profile()->GetPrefs()->SetBoolean(
       prefs::kAutofillAuxiliaryProfilesEnabled, true);
   profile()->GetPrefs()->ClearPref(prefs::kAutofillAuxiliaryProfilesEnabled);
   ASSERT_FALSE(profile()->GetPrefs()->GetBoolean(
       prefs::kAutofillAuxiliaryProfilesEnabled));
 #endif
 }