Update usages of std::map to use ScopedPtrMap.

chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h

 // Copyright 2015 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 CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_LAUNCHER_SEARCH_PROVIDER_H_
 #define CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_LAUNCHER_SEARCH_PROVIDER_H_
 
+#include "base/containers/scoped_ptr_map.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.h"
 #include "extensions/common/extension.h"
 #include "ui/app_list/search_provider.h"
 
@@ skipping 12 matching lines @@
                         ScopedVector<LauncherSearchResult> extension_results);
 
  private:
   // Delays query for |kLauncherSearchProviderQueryDelayInMs|. This dispatches
   // the latest query after no more calls to Start() for the delay duration.
   void DelayQuery(const base::Closure& closure);
 
   // Dispatches |query| to LauncherSearchProvider service.
   void StartInternal(const base::string16& query);
 
-  // The search results of each extension. The STLValueDeleter will
-  // automatically free the vectors in this map, but elements that are
-  // individually erased or replaced must be manually deleted.
-  typedef std::map<extensions::ExtensionId, ScopedVector<LauncherSearchResult>*>
-      ExtensionResults;
-  ExtensionResults extension_results_;
-  STLValueDeleter<ExtensionResults> extension_results_deleter_;
+  // The search results of each extension.
+  base::ScopedPtrMap<extensions::ExtensionId,
+                     scoped_ptr<ScopedVector<LauncherSearchResult>>>
+      extension_results_;
 
   // A timer to delay query.
   base::OneShotTimer<LauncherSearchProvider> query_timer_;
 
   // The timestamp of the last query.
   base::Time last_query_time_;
 
   // The reference to profile to get LauncherSearchProvider service.
   Profile* profile_;
 
   base::WeakPtrFactory<LauncherSearchProvider> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherSearchProvider);
 };
 
 }  // namespace app_list
 
 #endif  // CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_LAUNCHER_SEARCH_PROVIDER_H_