[Autofill] Check for full state name and abbreviation when determining types to upload.

components/autofill/core/browser/autofill_profile.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_profile.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <ostream>
@@ skipping 618 matching lines @@
                                       ADDRESS_HOME_STREET_ADDRESS)),
                                   CanonicalizeProfileString(GetRawInfo(
                                       ADDRESS_HOME_STREET_ADDRESS)))) {
           return false;
         }
         continue;
       }
       // Special case for the state to support abbreviations. Currently only the
       // US states are supported.
       if (field_type == ADDRESS_HOME_STATE) {
-        base::string16 full, abbreviation;
+        base::string16 full;
+        base::string16 abbreviation;
         state_names::GetNameAndAbbreviation(GetRawInfo(ADDRESS_HOME_STATE),
                                             &full, &abbreviation);
         if (compare.StringsEqual(profile.GetRawInfo(ADDRESS_HOME_STATE),
                                  full) ||
             compare.StringsEqual(profile.GetRawInfo(ADDRESS_HOME_STATE),
                                  abbreviation))
           continue;
       }
       if (!compare.StringsEqual(profile.GetRawInfo(field_type),
                                 GetRawInfo(field_type))) {
@@ skipping 397 matching lines @@
             << " " << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_CITY)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY)) << " "
             << profile.language_code() << " "
             << UTF16ToUTF8(profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill