Move a bunch of non-shared methods out of the FormGroup class.

chrome/browser/autofill/autofill_profile_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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ skipping 514 matching lines @@
   b.reset(new AutofillProfile);
   autofill_test::SetProfileInfo(a.get(), "Thomas", NULL, "Jefferson",
       "declaration_guy@gmail.com", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
       NULL);
   autofill_test::SetProfileInfo(a.get(), "Thomas", NULL, "Adams",
       "declaration_guy@gmail.com", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
       NULL);
   EXPECT_FALSE(a->IsSubsetOf(*b));
 }
 
-TEST_F(AutofillProfileTest, IntersectionOfTypesHasEqualValues) {
-  scoped_ptr<AutofillProfile> a, b;
-
-  // Intersection of types contains the fields NAME_FIRST, NAME_LAST,
-  // EMAIL_ADDRESS.  The values of these field types are equal between the two
-  // profiles.
-  a.reset(new AutofillProfile);
-  b.reset(new AutofillProfile);
-  autofill_test::SetProfileInfo(a.get(), "Thomas", NULL, "Jefferson",
-      "declaration_guy@gmail.com", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-      "12134759123");
-  autofill_test::SetProfileInfo(b.get(), "Thomas", NULL, "Jefferson",
-      "declaration_guy@gmail.com", "United States Government", "Monticello",
-      NULL, "Charlottesville", "Virginia", "22902", NULL, NULL);
-  EXPECT_TRUE(a->IntersectionOfTypesHasEqualValues(*b));
-
-  // Intersection of types contains the fields NAME_FIRST, NAME_LAST,
-  // EMAIL_ADDRESS. The value of EMAIL_ADDRESS differs between the two profiles.
-  a.reset(new AutofillProfile);
-  b.reset(new AutofillProfile);
-  autofill_test::SetProfileInfo(a.get(), "Thomas", NULL, "Jefferson",
-      "poser@yahoo.com", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-      "12134759123");
-  autofill_test::SetProfileInfo(b.get(), "Thomas", NULL, "Jefferson",\
-      "declaration_guy@gmail.com", "United States Government", "Monticello",
-      NULL, "Charlottesville", "Virginia", "22902", NULL, NULL);
-  EXPECT_FALSE(a->IntersectionOfTypesHasEqualValues(*b));
-
-  // Intersection of types is empty.
-  a.reset(new AutofillProfile);
-  b.reset(new AutofillProfile);
-  autofill_test::SetProfileInfo(a.get(), "Thomas", NULL, "Jefferson",
-      "poser@yahoo.com", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-      "12134759123");
-  autofill_test::SetProfileInfo(b.get(), NULL, NULL, NULL, NULL,
-      "United States Government", "Monticello", NULL, "Charlottesville",
-      "Virginia", "22902", NULL, NULL);
-  EXPECT_FALSE(a->IntersectionOfTypesHasEqualValues(*b));
-}
-
-TEST_F(AutofillProfileTest, MergeWith) {
-  scoped_ptr<AutofillProfile> a, b;
-
-  // Merge |b| into |a|.
-  a.reset(new AutofillProfile);
-  b.reset(new AutofillProfile);
-  autofill_test::SetProfileInfo(a.get(), "Jimmy", NULL, NULL, NULL,
-      NULL, NULL, NULL, NULL, NULL, NULL, NULL, "12134759123");
-  autofill_test::SetProfileInfo(b.get(), "James", NULL, "Madison",
-      "constitutionalist@gmail.com", "United States Government", "Monticello",
-      NULL, "Charlottesville", "Virginia", "22902", NULL, NULL);
-  AutofillProfile expected_b(*b);
-  a->MergeWith(*b);
-
-  AutofillProfile expected_a;
-  autofill_test::SetProfileInfo(&expected_a, "Jimmy", NULL, "Madison",
-      "constitutionalist@gmail.com", "United States Government", "Monticello",
-      NULL, "Charlottesville", "Virginia", "22902", NULL, "12134759123");
-  EXPECT_EQ(0, expected_a.Compare(*a));
-  EXPECT_EQ(0, expected_b.Compare(*b));
-}
-
 TEST_F(AutofillProfileTest, AssignmentOperator){
   AutofillProfile a, b;
 
   // Result of assignment should be logically equal to the original profile.
   autofill_test::SetProfileInfo(&a, "Marion", "Mitchell", "Morrison",
                                 "marion@me.xyz", "Fox", "123 Zoo St.", "unit 5",
                                 "Hollywood", "CA", "91601", "US",
                                 "12345678910");
   b = a;
   EXPECT_TRUE(a == b);
@@ skipping 167 matching lines @@
   // Delete values.
   set_values.clear();
   p.SetMultiInfo(PHONE_HOME_WHOLE_NUMBER, set_values);
   p.GetMultiInfo(PHONE_HOME_WHOLE_NUMBER, &get_values);
   ASSERT_EQ(1UL, get_values.size());
   EXPECT_EQ(string16(), get_values[0]);
 
   // Expect regular |GetInfo| returns empty value.
   EXPECT_EQ(string16(), p.GetInfo(PHONE_HOME_WHOLE_NUMBER));
 }