Remove stl_util's STLDeleteContainerPairPointers.

Along the way, remove some linked_ptr usage, too.

BUG=555865,556939

Review-Url: https://codereview.chromium.org/2240083004
Cr-Commit-Position: refs/heads/master@{#412674}
diff --git a/components/spellcheck/browser/spelling_service_client.h b/components/spellcheck/browser/spelling_service_client.h
index 97ad1b1c..344e4558 100644
--- a/components/spellcheck/browser/spelling_service_client.h
+++ b/components/spellcheck/browser/spelling_service_client.h
@@ -97,10 +97,14 @@
 
  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;
@@ -118,7 +122,8 @@
   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_