Remove stl_util's deletion function use from chrome/.

chrome/browser/ui/webui/inspect_ui.cc

 // 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.
 
 #include "chrome/browser/ui/webui/inspect_ui.h"
 
 #include "base/macros.h"
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "chrome/browser/devtools/devtools_targets_ui.h"
 #include "chrome/browser/devtools/devtools_ui_bindings.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
@@ skipping 421 matching lines @@
                  base::Unretained(this)));
   pref_change_registrar_.Add(prefs::kDevToolsTCPDiscoveryConfig,
       base::Bind(&InspectUI::UpdateTCPDiscoveryConfig,
                  base::Unretained(this)));
 }
 
 void InspectUI::StopListeningNotifications() {
   if (target_handlers_.empty())
     return;
 
-  base::STLDeleteValues(&target_handlers_);
+  target_handlers_.clear();
 
   port_status_serializer_.reset();
 
   notification_registrar_.RemoveAll();
   pref_change_registrar_.RemoveAll();
 }
 
 content::WebUIDataSource* InspectUI::CreateInspectUIHTMLSource() {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIInspectHost);
@@ skipping 66 matching lines @@
   prefs->Set(prefs::kDevToolsPortForwardingConfig, default_config);
 }
 
 const base::Value* InspectUI::GetPrefValue(const char* name) {
   Profile* profile = Profile::FromWebUI(web_ui());
   return profile->GetPrefs()->FindPreference(name)->GetValue();
 }
 
 void InspectUI::AddTargetUIHandler(
     std::unique_ptr<DevToolsTargetsUIHandler> handler) {
-  DevToolsTargetsUIHandler* handler_ptr = handler.release();
-  target_handlers_[handler_ptr->source_id()] = handler_ptr;
+  std::string id = handler->source_id();
+  target_handlers_[id] = std::move(handler);
 }
 
 DevToolsTargetsUIHandler* InspectUI::FindTargetHandler(
     const std::string& source_id) {
-  TargetHandlerMap::iterator it = target_handlers_.find(source_id);
-     return it != target_handlers_.end() ? it->second : nullptr;
+  auto it = target_handlers_.find(source_id);
+  return it != target_handlers_.end() ? it->second.get() : nullptr;
 }
 
 scoped_refptr<content::DevToolsAgentHost> InspectUI::FindTarget(
     const std::string& source_id, const std::string& target_id) {
-  TargetHandlerMap::iterator it = target_handlers_.find(source_id);
+  auto it = target_handlers_.find(source_id);
   return it != target_handlers_.end() ?
       it->second->GetTarget(target_id) : nullptr;
 }
 
 void InspectUI::PopulateTargets(const std::string& source,
                                 const base::ListValue& targets) {
   web_ui()->CallJavascriptFunctionUnsafe("populateTargets",
                                          base::StringValue(source), targets);
 }
 
 void InspectUI::ForceUpdateIfNeeded(const std::string& source_id,
                                     const std::string& target_type) {
   // TODO(dgozman): remove this after moving discovery to protocol.
   // See crbug.com/398049.
   if (target_type != content::DevToolsAgentHost::kTypeServiceWorker)
     return;
   DevToolsTargetsUIHandler* handler = FindTargetHandler(source_id);
   if (handler)
     handler->ForceUpdate();
 }
 
 void InspectUI::PopulatePortStatus(const base::Value& status) {
   web_ui()->CallJavascriptFunctionUnsafe("populatePortStatus", status);
 }
 
 void InspectUI::ShowIncognitoWarning() {
   web_ui()->CallJavascriptFunctionUnsafe("showIncognitoWarning");
 }