Remove STLDeleteContainerPairFirstPointers from AutofillDownloadManager

components/autofill/core/browser/autofill_download_manager.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DOWNLOAD_MANAGER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DOWNLOAD_MANAGER_H_
 
 #include <stddef.h>
 #include <list>
 #include <map>
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "net/base/backoff_entry.h"
@@ skipping 107 matching lines @@
   // The AutofillDriver that this instance will use. Must not be null, and must
   // outlive this instance.
   AutofillDriver* const driver_;  // WEAK
 
   // The observer to notify when server predictions are successfully received.
   // Must not be null.
   AutofillDownloadManager::Observer* const observer_;  // WEAK
 
   // For each requested form for both query and upload we create a separate
   // request and save its info. As url fetcher is identified by its address
-  // we use a map between fetchers and info.
-  std::map<net::URLFetcher*, FormRequestData> url_fetchers_;
+  // we use a map between fetchers and info. The value type is a pair of an
+  // owning pointer to the key and the actual FormRequestData.
+  std::map<net::URLFetcher*,
+           std::pair<std::unique_ptr<net::URLFetcher>, FormRequestData>>
+      url_fetchers_;
 
   // Cached QUERY requests.
   QueryRequestCache cached_forms_;
   size_t max_form_cache_size_;
 
   // Used for exponential backoff of requests.
   net::BackoffEntry fetcher_backoff_;
 
   // Needed for unit-test.
   int fetcher_id_for_unittest_;
 
   base::WeakPtrFactory<AutofillDownloadManager> weak_factory_;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DOWNLOAD_MANAGER_H_