[Autofill] Cleanup disabled Tests

chrome/browser/autofill/autofill_browsertest.cc

 // Copyright (c) 2012 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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
@@ skipping 184 matching lines @@
   int AggregateProfilesIntoAutofillPrefs(const std::string& filename) {
     CHECK(test_server()->Start());
 
     std::string data;
     base::FilePath data_file =
         ui_test_utils::GetTestFilePath(base::FilePath().AppendASCII("autofill"),
                                        base::FilePath().AppendASCII(filename));
     CHECK(file_util::ReadFileToString(data_file, &data));
     std::vector<std::string> lines;
     base::SplitString(data, '\n', &lines);
+    int parsed_profiles = 0;
     for (size_t i = 0; i < lines.size(); ++i) {
       if (StartsWithASCII(lines[i], "#", false))
         continue;
+
       std::vector<std::string> fields;
       base::SplitString(lines[i], '|', &fields);
       if (fields.empty())
         continue;  // Blank line.
+
+      ++parsed_profiles;
       CHECK_EQ(12u, fields.size());
 
       FormMap data;
       data["NAME_FIRST"] = fields[0];
       data["NAME_MIDDLE"] = fields[1];
       data["NAME_LAST"] = fields[2];
       data["EMAIL_ADDRESS"] = fields[3];
       data["COMPANY_NAME"] = fields[4];
       data["ADDRESS_HOME_LINE1"] = fields[5];
       data["ADDRESS_HOME_LINE2"] = fields[6];
       data["ADDRESS_HOME_CITY"] = fields[7];
       data["ADDRESS_HOME_STATE"] = fields[8];
       data["ADDRESS_HOME_ZIP"] = fields[9];
       data["ADDRESS_HOME_COUNTRY"] = fields[10];
       data["PHONE_HOME_WHOLE_NUMBER"] = fields[11];
 
       FillFormAndSubmit("duplicate_profiles_test.html", data);
     }
-    return lines.size();
+    return parsed_profiles;
   }
 
   void ExpectFieldValue(const std::string& field_name,
                         const std::string& expected_value) {
     std::string value;
     ASSERT_TRUE(content::ExecuteScriptAndExtractString(
         browser()->tab_strip_model()->GetActiveWebContents(),
         "window.domAutomationController.send("
         "    document.getElementById('" + field_name + "').value);",
         &value));
@@ skipping 446 matching lines @@
 }
 
 // Test that profiles merge for aggregated data with same address.
 // The criterion for when two profiles are expected to be merged is when their
 // 'Address Line 1' and 'City' data match. When two profiles are merged, any
 // remaining address fields are expected to be overwritten. Any non-address
 // fields should accumulate multi-valued data.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedProfilesWithSameAddress) {
-  AggregateProfilesIntoAutofillPrefs("dataset_2.txt");
+  AggregateProfilesIntoAutofillPrefs("dataset_same_address.txt");
 
   ASSERT_EQ(3u, personal_data_manager()->GetProfiles().size());
 }
 
 // Test profiles are not merged without mininum address values.
 // Mininum address values needed during aggregation are: address line 1, city,
 // state, and zip code.
 // Profiles are merged when data for address line 1 and city match.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_ProfilesNotMergedWhenNoMinAddressData) {
   AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
 
   ASSERT_EQ(0u, personal_data_manager()->GetProfiles().size());
 }
 
 // Test Autofill ability to merge duplicate profiles and throw away junk.
 // TODO(isherman): this looks redundant, consider removing.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
-      AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
+      AggregateProfilesIntoAutofillPrefs("dataset_duplicated_profiles.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }
 
 }  // namespace autofill