rAc: fix validation logic when autofill completion sets country

chrome/browser/ui/autofill/data_model_wrapper.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/autofill/data_model_wrapper.h"
 
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/ui/autofill/autofill_dialog_common.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 #include "components/autofill/content/browser/wallet/wallet_address.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "components/autofill/core/browser/autofill_data_model.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace autofill {
 
 DataModelWrapper::~DataModelWrapper() {}
 
 void DataModelWrapper::FillInputs(DetailInputs* inputs) {
   for (size_t i = 0; i < inputs->size(); ++i) {

[Dan Beam, 2013/11/05 02:54:43]

nit: DetailInput* input = &(*inputs)[i];

-    (*inputs)[i].initial_value = GetInfo(AutofillType((*inputs)[i].type));
+    (*inputs)[i].initial_value = common::GetHardcodedValueForType(
+        (*inputs)[i].type);
+    if ((*inputs)[i].initial_value.empty())
+      (*inputs)[i].initial_value = GetInfo(AutofillType((*inputs)[i].type));
   }
 }
 
 base::string16 DataModelWrapper::GetInfoForDisplay(const AutofillType& type)
     const {
   return GetInfo(type);
 }
 
 gfx::Image DataModelWrapper::GetIcon() {
   return gfx::Image();
@@ skipping 319 matching lines @@
   ServerFieldType storable_type = type.GetStorableType();
   for (DetailOutputMap::const_iterator it = outputs_.begin();
        it != outputs_.end(); ++it) {
     if (storable_type == AutofillType(it->first->type).GetStorableType())
       return it->second;
   }
   return base::string16();
 }
 
 }  // namespace autofill