Clean up ownership in WebUI creation.

chrome/browser/ui/webui/uber/uber_ui.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 CHROME_BROWSER_UI_WEBUI_UBER_UBER_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_UBER_UBER_UI_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 39 matching lines @@
 
   // WebUIController implementation.
   bool OverrideHandleWebUIMessage(const GURL& source_url,
                                   const std::string& message,
                                   const base::ListValue& args) override;
 
   // We forward these to |sub_uis_|.
   void RenderViewCreated(content::RenderViewHost* render_view_host) override;
 
  private:
-  // A map from URL origin to WebUI instance.
-  typedef std::map<std::string, content::WebUI*> SubpageMap;
-
   // Creates and stores a WebUI for the given URL.
   void RegisterSubpage(const std::string& page_url,
                        const std::string& page_host);
 
   SubframeLogger subframe_logger_;
 
-  // The WebUI*s in this map are owned.
-  SubpageMap sub_uis_;
+  // Map from URL origin to WebUI instance.
+  std::map<std::string, std::unique_ptr<content::WebUI>> sub_uis_;
 
   DISALLOW_COPY_AND_ASSIGN(UberUI);
 };
 
 class UberFrameUI : public content::WebUIController,
                     public extensions::ExtensionRegistryObserver {
  public:
   explicit UberFrameUI(content::WebUI* web_ui);
   ~UberFrameUI() override;
 
  private:
   // extensions::ExtensionRegistryObserver implementation.
   void OnExtensionLoaded(content::BrowserContext* browser_context,
                          const extensions::Extension* extension) override;
   void OnExtensionUnloaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
       extensions::UnloadedExtensionInfo::Reason reason) override;
 
   ScopedObserver<extensions::ExtensionRegistry,
                  extensions::ExtensionRegistryObserver>
       extension_registry_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(UberFrameUI);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_UBER_UBER_UI_H_