Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

chrome/browser/ui/omnibox/chrome_omnibox_client.cc

 // Copyright 2013 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/omnibox/chrome_omnibox_client.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_stats.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
@@ skipping 104 matching lines @@
       scheme_classifier_(profile),
       request_id_(BitmapFetcherService::REQUEST_ID_INVALID) {}
 
 ChromeOmniboxClient::~ChromeOmniboxClient() {
   BitmapFetcherService* image_service =
       BitmapFetcherServiceFactory::GetForBrowserContext(profile_);
   if (image_service)
     image_service->CancelRequest(request_id_);
 }
 
-scoped_ptr<AutocompleteProviderClient>
+std::unique_ptr<AutocompleteProviderClient>
 ChromeOmniboxClient::CreateAutocompleteProviderClient() {
-  return make_scoped_ptr(new ChromeAutocompleteProviderClient(profile_));
+  return base::WrapUnique(new ChromeAutocompleteProviderClient(profile_));
 }
 
-scoped_ptr<OmniboxNavigationObserver>
+std::unique_ptr<OmniboxNavigationObserver>
 ChromeOmniboxClient::CreateOmniboxNavigationObserver(
     const base::string16& text,
     const AutocompleteMatch& match,
     const AutocompleteMatch& alternate_nav_match) {
-  return make_scoped_ptr(new ChromeOmniboxNavigationObserver(
+  return base::WrapUnique(new ChromeOmniboxNavigationObserver(
       profile_, text, match, alternate_nav_match));
 }
 
 bool ChromeOmniboxClient::CurrentPageExists() const {
   return (controller_->GetWebContents() != NULL);
 }
 
 const GURL& ChromeOmniboxClient::GetURL() const {
   return controller_->GetWebContents()->GetVisibleURL();
 }
@@ skipping 312 matching lines @@
     if (prerenderer)
       prerenderer->Prerender(suggestion);
   }
 }
 
 void ChromeOmniboxClient::OnBitmapFetched(const BitmapFetchedCallback& callback,
                                           const SkBitmap& bitmap) {
   request_id_ = BitmapFetcherService::REQUEST_ID_INVALID;
   callback.Run(bitmap);
 }