Switch SupportsUserData uses to use unique_ptr.

components/favicon/content/content_favicon_driver.cc

 // 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.
 
 #include "components/favicon/content/content_favicon_driver.h"
 
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "components/favicon/content/favicon_url_util.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon/core/favicon_url.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/common/favicon_url.h"
 #include "ui/gfx/image/image.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(favicon::ContentFaviconDriver);
 
 namespace favicon {
 
 // static
 void ContentFaviconDriver::CreateForWebContents(
     content::WebContents* web_contents,
     FaviconService* favicon_service,
     history::HistoryService* history_service,
     bookmarks::BookmarkModel* bookmark_model) {
   if (FromWebContents(web_contents))
     return;
 
   web_contents->SetUserData(
-      UserDataKey(), new ContentFaviconDriver(web_contents, favicon_service,
-                                              history_service, bookmark_model));
+      UserDataKey(),
+      base::WrapUnique(new ContentFaviconDriver(
+          web_contents, favicon_service, history_service, bookmark_model)));
 }
 
 void ContentFaviconDriver::SaveFavicon() {
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   if (!entry)
     return;
 
   // Make sure the page is in history, otherwise adding the favicon does
   // nothing.
@@ skipping 145 matching lines @@
   // redownloaded.
   GURL url = navigation_handle->GetURL();
   if (url != bypass_cache_page_url_)
     bypass_cache_page_url_ = GURL();
 
   // Get the favicon, either from history or request it from the net.
   FetchFavicon(url);
 }
 
 }  // namespace favicon