Remove stl_util's STLDeleteContainerPairPointers.

components/spellcheck/browser/spelling_service_client.h

 // 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.
 
 #ifndef COMPONENTS_SPELLCHECK_BROWSER_SPELLING_SERVICE_CLIENT_H_
 #define COMPONENTS_SPELLCHECK_BROWSER_SPELLING_SERVICE_CLIENT_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 79 matching lines @@
   // Returns whether the specified service is available for the given context.
   static bool IsAvailable(content::BrowserContext* context, ServiceType type);
 
  protected:
   // Parses a JSON-RPC response from the Spelling service.
   bool ParseResponse(const std::string& data,
                      std::vector<SpellCheckResult>* results);
 
  private:
   struct TextCheckCallbackData {
-    TextCheckCallbackData(TextCheckCompleteCallback callback,
+    TextCheckCallbackData(std::unique_ptr<net::URLFetcher> fetcher,
+                          TextCheckCompleteCallback callback,
                           base::string16 text);
     ~TextCheckCallbackData();
 
+    // The fetcher used.
+    std::unique_ptr<net::URLFetcher> fetcher;
+
     // The callback function to be called when we receive a response from the
     // Spelling service and parse it.
     TextCheckCompleteCallback callback;
 
     // The text checked by the Spelling service.
     base::string16 text;
   };
 
   // net::URLFetcherDelegate implementation.
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Creates a URLFetcher object used for sending a JSON-RPC request. This
   // function is overridden by unit tests to prevent them from actually sending
   // requests to the Spelling service.
   virtual std::unique_ptr<net::URLFetcher> CreateURLFetcher(const GURL& url);
 
   // The URLFetcher object used for sending a JSON-RPC request.
-  std::map<const net::URLFetcher*, TextCheckCallbackData*> spellcheck_fetchers_;
+  std::map<const net::URLFetcher*, std::unique_ptr<TextCheckCallbackData>>
+      spellcheck_fetchers_;
 };
 
 #endif  // COMPONENTS_SPELLCHECK_BROWSER_SPELLING_SERVICE_CLIENT_H_