Remove application locale cache in autofill code.

components/autofill/browser/autofill_manager.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 "components/autofill/browser/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/utf_string_conversions.h"
 #include "components/autofill/browser/autocheckout/whitelist_manager.h"
 #include "components/autofill/browser/autocheckout_manager.h"
 #include "components/autofill/browser/autocomplete_history_manager.h"
-#include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_field.h"
 #include "components/autofill/browser/autofill_manager_delegate.h"
 #include "components/autofill/browser/autofill_manager_test_delegate.h"
 #include "components/autofill/browser/autofill_metrics.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/form_structure.h"
 #include "components/autofill/browser/password_generator.h"
@@ skipping 128 matching lines @@
 
     field->set_possible_types(matching_types);
   }
 }
 
 }  // namespace
 
 // static
 void AutofillManager::CreateForWebContentsAndDelegate(
     content::WebContents* contents,
-    autofill::AutofillManagerDelegate* delegate) {
+    autofill::AutofillManagerDelegate* delegate,
+    const std::string& app_locale) {
   if (FromWebContents(contents))
     return;
 
   contents->SetUserData(kAutofillManagerWebContentsUserDataKey,
-                        new AutofillManager(contents, delegate));
+                        new AutofillManager(contents, delegate, app_locale));
 
   // Trigger the lazy creation of AutocheckoutWhitelistManagerService, and
   // schedule a fetch of the Autocheckout whitelist file if it's not already
   // loaded. This helps ensure that the whitelist will be available by the time
   // the user navigates to a form on which Autocheckout should be enabled.
   delegate->GetAutocheckoutWhitelistManager();
 }
 
 // static
 AutofillManager* AutofillManager::FromWebContents(
     content::WebContents* contents) {
   return static_cast<AutofillManager*>(
       contents->GetUserData(kAutofillManagerWebContentsUserDataKey));
 }
 
 AutofillManager::AutofillManager(content::WebContents* web_contents,
-                                 autofill::AutofillManagerDelegate* delegate)
+                                 autofill::AutofillManagerDelegate* delegate,
+                                 const std::string& app_locale)
     : content::WebContentsObserver(web_contents),
       manager_delegate_(delegate),
+      app_locale_(app_locale),
       personal_data_(delegate->GetPersonalDataManager()),
       download_manager_(web_contents->GetBrowserContext(), this),
       disable_download_manager_requests_(false),
       autocomplete_history_manager_(web_contents),
       autocheckout_manager_(this),
       metric_logger_(new AutofillMetrics),
       has_logged_autofill_enabled_(false),
       has_logged_address_suggestions_count_(false),
       did_show_suggestions_(false),
       user_did_type_(false),
@@ skipping 216 matching lines @@
     }
 
     // Note that ownership of |submitted_form| is passed to the second task,
     // using |base::Owned|.
     FormStructure* raw_submitted_form = submitted_form.get();
     BrowserThread::GetBlockingPool()->PostTaskAndReply(
         FROM_HERE,
         base::Bind(&DeterminePossibleFieldTypesForUpload,
                    copied_profiles,
                    copied_credit_cards,
-                   AutofillCountry::ApplicationLocale(),
+                   app_locale_,
                    raw_submitted_form),
         base::Bind(&AutofillManager::UploadFormDataAsyncCallback,
                    weak_ptr_factory_.GetWeakPtr(),
                    base::Owned(submitted_form.release()),
                    forms_loaded_timestamp_,
                    initial_interaction_timestamp_,
                    timestamp));
   }
 
   return true;
@@ skipping 175 matching lines @@
   DCHECK(autofill_field);
 
   FormData result = form;
 
   // If the relevant section is auto-filled, we should fill |field| but not the
   // rest of the form.
   if (SectionIsAutofilled(*form_structure, form, autofill_field->section())) {
     for (std::vector<FormFieldData>::iterator iter = result.fields.begin();
          iter != result.fields.end(); ++iter) {
       if ((*iter) == field) {
-        form_group->FillFormField(*autofill_field, variant, &(*iter));
+        form_group->FillFormField(
+            *autofill_field, variant, app_locale_, &(*iter));
         // Mark the cached field as autofilled, so that we can detect when a
         // user edits an autofilled field (for metrics).
         autofill_field->is_autofilled = true;
         break;
       }
     }
 
     host->Send(new AutofillMsg_FormDataFilled(host->GetRoutingID(), query_id,
                                               result));
     return;
@@ skipping 18 matching lines @@
       //   (b) part of the same logical unit, e.g. name or phone number,
       // then take the multi-profile "variant" into account.
       // Otherwise fill with the default (zeroth) variant.
       size_t use_variant = 0;
       if (result.fields[i] == field ||
           field_group_type == initiating_group_type) {
         use_variant = variant;
       }
       form_group->FillFormField(*cached_field,
                                 use_variant,
+                                app_locale_,
                                 &result.fields[i]);
       // Mark the cached field as autofilled, so that we can detect when a user
       // edits an autofilled field (for metrics).
       form_structure->field(i)->is_autofilled = true;
     }
   }
 
   autofilled_form_signatures_.push_front(form_structure->FormSignature());
   // Only remember the last few forms that we've seen, both to avoid false
   // positives and to avoid wasting memory.
@@ skipping 318 matching lines @@
 
   if (external_delegate_)
     external_delegate_->Reset();
 }
 
 AutofillManager::AutofillManager(content::WebContents* web_contents,
                                  autofill::AutofillManagerDelegate* delegate,
                                  PersonalDataManager* personal_data)
     : content::WebContentsObserver(web_contents),
       manager_delegate_(delegate),
+      app_locale_("en-US"),
       personal_data_(personal_data),
       download_manager_(web_contents->GetBrowserContext(), this),
       disable_download_manager_requests_(true),
       autocomplete_history_manager_(web_contents),
       autocheckout_manager_(this),
       metric_logger_(new AutofillMetrics),
       has_logged_autofill_enabled_(false),
       has_logged_address_suggestions_count_(false),
       did_show_suggestions_(false),
       user_did_type_(false),
@@ skipping 313 matching lines @@
   *profile_guid = IDToGUID(profile_id);
 }
 
 void AutofillManager::UpdateInitialInteractionTimestamp(
     const TimeTicks& interaction_timestamp) {
   if (initial_interaction_timestamp_.is_null() ||
       interaction_timestamp < initial_interaction_timestamp_) {
     initial_interaction_timestamp_ = interaction_timestamp;
   }
 }