[Autofill] Move FieldTypeGroup out of the AutofillType class.

chrome/browser/ui/cocoa/autofill/autofill_section_container.mm

 // Copyright (c) 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.
 
 #import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h"
 
 #include <algorithm>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 55 matching lines @@
     *line2 = text.substr(position + line_return.length());
   }
 }
 
 // If the Autofill data comes from a credit card, make sure to overwrite the
 // CC comboboxes (even if they already have something in them). If the
 // Autofill data comes from an AutofillProfile, leave the comboboxes alone.
 // TODO(groby): This kind of logic should _really_ live on the controller.
 bool ShouldOverwriteComboboxes(autofill::DialogSection section,
                                autofill::AutofillFieldType type) {
-  using autofill::AutofillType;
-  if (AutofillType(type).group() != AutofillType::CREDIT_CARD) {
+  if (autofill::AutofillType(type).group() != autofill::CREDIT_CARD) {
     return false;
   }
 
   if (section == autofill::SECTION_CC) {
     return true;
   }
 
   return section == autofill::SECTION_CC_BILLING;
 }
 
@@ skipping 232 matching lines @@
   [field setFieldValue:@""];
 
   if (ShouldOverwriteComboboxes(section_, input.type)) {
     for (NSControl* control in [inputs_ subviews]) {
       AutofillPopUpButton* popup =
           base::mac::ObjCCast<AutofillPopUpButton>(control);
       if (popup) {
         autofill::AutofillFieldType fieldType =
             [self fieldTypeForControl:popup];
         if (autofill::AutofillType(fieldType).group() ==
-                autofill::AutofillType::CREDIT_CARD) {
+                autofill::CREDIT_CARD) {
           ui::ComboboxModel* model =
               controller_->ComboboxModelForAutofillType(fieldType);
           DCHECK(model);
           [popup selectItemAtIndex:model->GetDefaultIndex()];
         }
       }
     }
   }
 
   [self updateAndClobber:NO];
@@ skipping 283 matching lines @@
 
 - (void)activateFieldForInput:(const autofill::DetailInput&)input {
   if ([self detailInputForType:input.type] != &input)
     return;
 
   NSControl<AutofillInputField>* field = [inputs_ viewWithTag:input.type];
   [[field window] makeFirstResponder:field];
 }
 
 @end