Clean up ownership in WebUI creation.

chrome/browser/ui/webui/uber/uber_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/uber/uber_ui.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
 #include "chrome/browser/ui/webui/log_web_ui_url.h"
 #include "chrome/browser/ui/webui/md_history_ui.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 150 matching lines @@
                   chrome::kChromeUIHelpHost);
   RegisterSubpage(chrome::kChromeUIHistoryFrameURL,
                   chrome::kChromeUIHistoryHost);
   RegisterSubpage(chrome::kChromeUISettingsFrameURL,
                   chrome::kChromeUISettingsHost);
   RegisterSubpage(chrome::kChromeUIUberFrameURL,
                   chrome::kChromeUIUberHost);
 }
 
 UberUI::~UberUI() {
-  base::STLDeleteValues(&sub_uis_);
 }
 
 void UberUI::RegisterSubpage(const std::string& page_url,
                              const std::string& page_host) {
   sub_uis_[page_url] = web_ui()->GetWebContents()->CreateSubframeWebUI(
       GURL(page_url), page_host);
 }
 
 content::WebUI* UberUI::GetSubpage(const std::string& page_url) {
   if (!base::ContainsKey(sub_uis_, page_url))
-    return NULL;
-  return sub_uis_[page_url];
+    return nullptr;
+  return sub_uis_[page_url].get();
 }
 
 void UberUI::RenderViewCreated(RenderViewHost* render_view_host) {
-  for (SubpageMap::iterator iter = sub_uis_.begin(); iter != sub_uis_.end();
-       ++iter) {
+  for (auto iter = sub_uis_.begin(); iter != sub_uis_.end(); ++iter) {
     iter->second->GetController()->RenderViewCreated(render_view_host);
   }
 }
 
 bool UberUI::OverrideHandleWebUIMessage(const GURL& source_url,
                                         const std::string& message,
                                         const base::ListValue& args) {
   // Find the appropriate subpage and forward the message.
-  SubpageMap::iterator subpage = sub_uis_.find(source_url.GetOrigin().spec());
+  auto subpage = sub_uis_.find(source_url.GetOrigin().spec());
   if (subpage == sub_uis_.end()) {
     // The message was sent from the uber page itself.
     DCHECK_EQ(std::string(chrome::kChromeUIUberHost), source_url.host());
     return false;
   }
 
   // The message was sent from a subpage.
   // TODO(jam) fix this to use interface
   // return subpage->second->GetController()->OverrideHandleWebUIMessage(
   //     source_url, message, args);
@@ skipping 29 matching lines @@
   // opens the default history page if one is uninstalled or disabled.
   UpdateHistoryNavigation(web_ui());
 }
 
 void UberFrameUI::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension,
     extensions::UnloadedExtensionInfo::Reason reason) {
   UpdateHistoryNavigation(web_ui());
 }