Renaming conflicting variables names (components/autofill)

When building using jumbo, files get merged and variables
and functions with the same name may end up in the same
namespace/scope and conflict.

This commit solves the issues in components/autofill
by renaming the conflicting functions and variables to
something more file specific.

Bug: 869381
Change-Id: Ifccae861ca7379346fb0939113ac227b770f9640
Reviewed-on: https://chromium-review.googlesource.com/1158235Reviewed-by: Vadym Doroshenko <dvadym@chromium.org>
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Cr-Commit-Position: refs/heads/master@{#579768}

components/autofill/core/browser/autofill_download_manager.cc

@@ -42,7 +42,7 @@ namespace autofill {
 namespace {
 
 const size_t kMaxQueryGetSize = 1400;  // 1.25KB
-const size_t kMaxFormCacheSize = 16;
+const size_t kAutofillDownloadManagerMaxFormCacheSize = 16;
 const size_t kMaxFieldsPerQueryRequest = 100;
 
 const net::BackoffEntry::Policy kAutofillBackoffPolicy = {
@@ -286,7 +286,7 @@ AutofillDownloadManager::AutofillDownloadManager(AutofillDriver* driver,
     : driver_(driver),
       observer_(observer),
       autofill_server_url_(GetAutofillServerURL()),
-      max_form_cache_size_(kMaxFormCacheSize),
+      max_form_cache_size_(kAutofillDownloadManagerMaxFormCacheSize),
       loader_backoff_(&kAutofillBackoffPolicy),
       weak_factory_(this) {
   DCHECK(observer_);

components/autofill/core/browser/autofill_handler.cc

@@ -16,7 +16,7 @@ namespace {
 
 // Set a conservative upper bound on the number of forms we are willing to
 // cache, simply to prevent unbounded memory consumption.
-const size_t kMaxFormCacheSize = 100;
+const size_t kAutofillHandlerMaxFormCacheSize = 100;
 
 }  // namespace
 
@@ -172,7 +172,7 @@ bool AutofillHandler::ParseForm(const FormData& form,
                                 const FormStructure* cached_form,
                                 FormStructure** parsed_form_structure) {
   DCHECK(parsed_form_structure);
-  if (form_structures_.size() >= kMaxFormCacheSize)
+  if (form_structures_.size() >= kAutofillHandlerMaxFormCacheSize)
     return false;
 
   auto form_structure = std::make_unique<FormStructure>(form);

components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge.cc

@@ -77,7 +77,7 @@ std::unique_ptr<EntityData> CreateEntityDataFromAutofillDataModel(
 }
 
 // Returns EntityData for wallet_metadata for |local_profile|.
-std::unique_ptr<EntityData> CreateEntityDataFromAutofillProfile(
+std::unique_ptr<EntityData> CreateWalletMetadataEntityDataFromAutofillProfile(
     const AutofillProfile& local_profile) {
   std::unique_ptr<EntityData> entity_data =
       CreateEntityDataFromAutofillDataModel(
@@ -213,7 +213,8 @@ void AutofillWalletMetadataSyncBridge::GetDataImpl(
   for (const std::unique_ptr<AutofillProfile>& entry : profiles) {
     std::string key = GetStorageKeyForEntryServerId(entry->server_id());
     if (!storage_keys_set || base::ContainsKey(*storage_keys_set, key)) {
-      batch->Put(key, CreateEntityDataFromAutofillProfile(*entry));
+      batch->Put(key,
+                 CreateWalletMetadataEntityDataFromAutofillProfile(*entry));
     }
   }
   for (const std::unique_ptr<CreditCard>& entry : cards) {

components/autofill/core/common/form_data.cc

@@ -17,7 +17,7 @@ namespace autofill {
 
 namespace {
 
-const int kPickleVersion = 6;
+const int kFormDataPickleVersion = 6;
 
 bool ReadGURL(base::PickleIterator* iter, GURL* url) {
   std::string spec;
@@ -152,7 +152,7 @@ std::ostream& operator<<(std::ostream& os, const FormData& form) {
 }
 
 void SerializeFormData(const FormData& form_data, base::Pickle* pickle) {
-  pickle->WriteInt(kPickleVersion);
+  pickle->WriteInt(kFormDataPickleVersion);
   pickle->WriteString16(form_data.name);
   pickle->WriteString(form_data.origin.spec());
   pickle->WriteString(form_data.action.spec());
@@ -179,7 +179,7 @@ bool DeserializeFormData(base::PickleIterator* iter, FormData* form_data) {
     return false;
   }
 
-  if (version < 1 || version > kPickleVersion) {
+  if (version < 1 || version > kFormDataPickleVersion) {
     DVLOG(1) << "Unknown FormData pickle version " << version;
     return false;
   }

components/autofill/core/common/form_field_data.cc

@@ -15,8 +15,8 @@ namespace autofill {
 namespace {
 
 // Increment this anytime pickle format is modified as well as provide
-// deserialization routine from previous kPickleVersion format.
-const int kPickleVersion = 7;
+// deserialization routine from previous kFormFieldDataPickleVersion format.
+const int kFormFieldDataPickleVersion = 7;
 
 void AddVectorToPickle(std::vector<base::string16> strings,
                        base::Pickle* pickle) {
@@ -280,7 +280,7 @@ bool FormFieldData::operator<(const FormFieldData& field) const {
 
 void SerializeFormFieldData(const FormFieldData& field_data,
                             base::Pickle* pickle) {
-  pickle->WriteInt(kPickleVersion);
+  pickle->WriteInt(kFormFieldDataPickleVersion);
   pickle->WriteString16(field_data.label);
   pickle->WriteString16(field_data.name);
   pickle->WriteString16(field_data.value);