Change DetailOutputMap to FieldValueMap

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 73 matching lines @@
 - (void)textfieldEditedOrActivated:(NSControl<AutofillInputField>*)field
                             edited:(BOOL)edited;
 
 // Convenience method to retrieve a field type via the control's tag.
 - (autofill::ServerFieldType)fieldTypeForControl:(NSControl*)control;
 
 // Find the DetailInput* associated with a field type.
 - (const autofill::DetailInput*)detailInputForType:
     (autofill::ServerFieldType)type;
 
-// Takes an NSArray of controls and builds a DetailOutputMap from them.
+// Takes an NSArray of controls and builds a FieldValueMap from them.
 // Translates between Cocoa code and delegate, essentially.
 // All controls must inherit from NSControl and conform to AutofillInputView.
-- (void)fillDetailOutputs:(autofill::DetailOutputMap*)outputs
+- (void)fillDetailOutputs:(autofill::FieldValueMap*)outputs
              fromControls:(NSArray*)controls;
 
 // Updates input fields based on delegate status. If |shouldClobber| is YES,
 // will clobber existing data and reset fields to the initial values.
 - (void)updateAndClobber:(BOOL)shouldClobber;
 
 // Return YES if this is a section that contains CC info. (And, more
 // importantly, a potential CVV field)
 - (BOOL)isCreditCardSection;
 
@@ skipping 18 matching lines @@
 
 - (id)initWithDelegate:(autofill::AutofillDialogViewDelegate*)delegate
             forSection:(autofill::DialogSection)section {
   if (self = [super init]) {
     section_ = section;
     delegate_ = delegate;
   }
   return self;
 }
 
-- (void)getInputs:(autofill::DetailOutputMap*)output {
+- (void)getInputs:(autofill::FieldValueMap*)output {
   [self fillDetailOutputs:output fromControls:[inputs_ subviews]];
 }
 
 // Note: This corresponds to Views' "UpdateDetailsGroupState".
 - (void)modelChanged {
   ui::MenuModel* suggestionModel = delegate_->MenuModelForSection(section_);
   menuController_.reset([[MenuController alloc] initWithModel:suggestionModel
                                        useWithPopUpButtonCell:YES]);
   NSMenu* menu = [menuController_ menu];
 
@@ skipping 201 matching lines @@
       fields = @[ [suggestContainer_ inputField] ];
   }
 
   // Ensure only editable fields are validated.
   fields = [fields filteredArrayUsingPredicate:
       [NSPredicate predicateWithBlock:
           ^BOOL(NSControl<AutofillInputField>* field, NSDictionary* bindings) {
               return [field isEnabled];
           }]];
 
-  autofill::DetailOutputMap detailOutputs;
+  autofill::FieldValueMap detailOutputs;
   [self fillDetailOutputs:&detailOutputs fromControls:fields];
   autofill::ValidityMessages messages = delegate_->InputsAreValid(
       section_, detailOutputs);
 
   for (NSControl<AutofillInputField>* input in fields) {
-    const autofill::ServerFieldType type = [self fieldTypeForControl:input];
     const autofill::ValidityMessage& message =
-        messages.GetMessageOrDefault(type);
+        messages.GetMessageOrDefault([self fieldTypeForControl:input]);
     if (validationType != autofill::VALIDATE_FINAL && !message.sure)
       continue;
     [input setValidityMessage:base::SysUTF16ToNSString(message.text)];
     [validationDelegate_ updateMessageForField:input];
   }
 
   return !messages.HasErrors();
 }
 
 - (NSString*)suggestionText {
@@ skipping 24 matching lines @@
   textFrameInScreen.origin =
       [[field window] convertBaseToScreen:textFrameInScreen.origin];
 
   // And adjust for gfx::Rect being flipped compared to OSX coordinates.
   NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
   textFrameInScreen.origin.y =
       NSMaxY([screen frame]) - NSMaxY(textFrameInScreen);
   gfx::Rect textFrameRect(NSRectToCGRect(textFrameInScreen));
 
   delegate_->UserEditedOrActivatedInput(section_,
-                                        [self detailInputForType:type],
+                                        type,
                                         [self view],
                                         textFrameRect,
                                         fieldValue,
                                         edited);
 
   // If the field is marked as invalid, check if the text is now valid.
   // Many fields (i.e. CC#) are invalid for most of the duration of editing,
   // so flagging them as invalid prematurely is not helpful. However,
   // correcting a minor mistake (i.e. a wrong CC digit) should immediately
   // result in validation - positive user feedback.
@@ skipping 24 matching lines @@
     (autofill::ServerFieldType)type {
   for (size_t i = 0; i < detailInputs_.size(); ++i) {
     if (detailInputs_[i]->type == type)
       return detailInputs_[i];
   }
   // TODO(groby): Needs to be NOTREACHED. Can't, due to the fact that tests
   // blindly call setFieldValue:forInput:, even for non-existing inputs.
   return NULL;
 }
 
-- (void)fillDetailOutputs:(autofill::DetailOutputMap*)outputs
+- (void)fillDetailOutputs:(autofill::FieldValueMap*)outputs
              fromControls:(NSArray*)controls {
   for (NSControl<AutofillInputField>* input in controls) {
     DCHECK([input isKindOfClass:[NSControl class]]);
     DCHECK([input conformsToProtocol:@protocol(AutofillInputField)]);
-    autofill::ServerFieldType fieldType = [self fieldTypeForControl:input];
-    DCHECK([self detailInputForType:fieldType]);
-    NSString* value = [input fieldValue];
-    outputs->insert(std::make_pair([self detailInputForType:fieldType],
-                                   base::SysNSStringToUTF16(value)));
+    outputs->insert(std::make_pair(
+        [self fieldTypeForControl:input],
+        base::SysNSStringToUTF16([input fieldValue])));
   }
 }
 
 - (NSTextField*)makeDetailSectionLabel:(NSString*)labelText {
   base::scoped_nsobject<NSTextField> label([[NSTextField alloc] init]);
   [label setFont:
       [[NSFontManager sharedFontManager] convertFont:[label font]
                                          toHaveTrait:NSBoldFontMask]];
   [label setStringValue:labelText];
   [label setEditable:NO];
@@ skipping 176 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];
   [self textfieldEditedOrActivated:field edited:NO];
 }
 
 @end