[rAc] Move email address into billing address section.

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 399 matching lines @@
 
 bool AutofillProfile::IsEmpty(const std::string& app_locale) const {
   ServerFieldTypeSet types;
   GetNonEmptyTypes(app_locale, &types);
   return types.empty();
 }
 
 bool AutofillProfile::IsPresentButInvalid(ServerFieldType type) const {
   std::string country = UTF16ToUTF8(GetRawInfo(ADDRESS_HOME_COUNTRY));
   base::string16 data = GetRawInfo(type);
+  if (data.empty())
+    return false;
+
   switch (type) {
     case ADDRESS_HOME_STATE:
-      if (!data.empty() && country == "US" && !autofill::IsValidState(data))
-        return true;
-      break;
+      return country == "US" && !autofill::IsValidState(data);
 
     case ADDRESS_HOME_ZIP:
-      if (!data.empty() && country == "US" && !autofill::IsValidZip(data))
-        return true;
-      break;
+      return country == "US" && !autofill::IsValidZip(data);
 
-    case PHONE_HOME_WHOLE_NUMBER: {
-      if (!data.empty() && !i18n::PhoneObject(data, country).IsValidNumber())
-        return true;
-      break;
-    }
+    case PHONE_HOME_WHOLE_NUMBER:
+      return !i18n::PhoneObject(data, country).IsValidNumber();
+
+    case EMAIL_ADDRESS:
+      return !autofill::IsValidEmailAddress(data);
 
     default:
       NOTREACHED();
-      break;
+      return false;
   }
-
-  return false;
 }
 
 
 int AutofillProfile::Compare(const AutofillProfile& profile) const {
   const ServerFieldType single_value_types[] = { COMPANY_NAME,
                                                  ADDRESS_HOME_LINE1,
                                                  ADDRESS_HOME_LINE2,
                                                  ADDRESS_HOME_CITY,
                                                  ADDRESS_HOME_STATE,
                                                  ADDRESS_HOME_ZIP,
@@ skipping 444 matching lines @@
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))
       << " "
       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill