[Autofill] Move FieldTypeGroup out of the AutofillType class.

components/autofill/content/browser/autocheckout_manager.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/content/browser/autocheckout_manager.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/content/browser/autocheckout_request_manager.h"
@@ skipping 124 matching lines @@
       callback);
 
   net::CookieOptions cookie_options;
   cookie_options.set_include_httponly();
   cookie_store->GetCookiesWithOptionsAsync(GURL(kGoogleAccountsUrl),
                                            cookie_options,
                                            cookie_callback);
 }
 
 bool IsBillingGroup(FieldTypeGroup group) {
-  return group == AutofillType::ADDRESS_BILLING ||
-         group == AutofillType::PHONE_BILLING ||
-         group == AutofillType::NAME_BILLING;
+  return group == ADDRESS_BILLING ||
+         group == PHONE_BILLING ||
+         group == NAME_BILLING;
 }
 
 const char kTransactionIdNotSet[] = "transaction id not set";
 
 }  // namespace
 
 AutocheckoutManager::AutocheckoutManager(AutofillManager* autofill_manager)
     : autofill_manager_(autofill_manager),
       metric_logger_(new AutofillMetrics),
       should_show_bubble_(true),
@@ skipping 196 matching lines @@
   billing_address_.reset(new AutofillProfile());
 
   for (size_t i = 0; i < result->field_count(); ++i) {
     AutofillFieldType type = result->field(i)->type();
     const base::string16& value = result->field(i)->value;
     if (type == CREDIT_CARD_VERIFICATION_CODE) {
       cvv_ = result->field(i)->value;
       continue;
     }
     FieldTypeGroup group = AutofillType(type).group();
-    if (group == AutofillType::CREDIT_CARD) {
+    if (group == CREDIT_CARD) {
       credit_card_->SetRawInfo(type, value);
       // TODO(dgwallinga): Find a way of cleanly deprecating CREDIT_CARD_NAME.
       // code.google.com/p/chromium/issues/detail?id=263498
       if (type == CREDIT_CARD_NAME)
         billing_address_->SetRawInfo(NAME_BILLING_FULL, value);
     } else if (type == ADDRESS_HOME_COUNTRY) {
       profile_->SetInfo(type, value, autofill_manager_->app_locale());
     } else if (type == ADDRESS_BILLING_COUNTRY) {
       billing_address_->SetInfo(type, value, autofill_manager_->app_locale());
     } else if (IsBillingGroup(group)) {
@@ skipping 111 matching lines @@
     }
     return;
   }
 
   // Handle verification code directly.
   if (type == CREDIT_CARD_VERIFICATION_CODE) {
     field_to_fill->value = cvv_;
     return;
   }
 
-  if (AutofillType(type).group() == AutofillType::CREDIT_CARD) {
+  if (AutofillType(type).group() == CREDIT_CARD) {
     credit_card_->FillFormField(
         field, 0, autofill_manager_->app_locale(), field_to_fill);
   } else if (IsBillingGroup(AutofillType(type).group())) {
     billing_address_->FillFormField(
         field, 0, autofill_manager_->app_locale(), field_to_fill);
   } else {
     profile_->FillFormField(
         field, 0, autofill_manager_->app_locale(), field_to_fill);
   }
 }
@@ skipping 62 matching lines @@
 
   SendAutocheckoutStatus(status);
   if (status == SUCCESS)
     autofill_manager_->delegate()->OnAutocheckoutSuccess();
   else
     autofill_manager_->delegate()->OnAutocheckoutError();
   in_autocheckout_flow_ = false;
 }
 
 }  // namespace autofill