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

chrome/browser/ui/omnibox/omnibox_controller_unittest.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 <stddef.h>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/omnibox/browser/omnibox_client.h"
 #include "components/omnibox/browser/omnibox_controller.h"
 #include "components/sessions/core/session_id.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 class TestOmniboxClient : public OmniboxClient {
  public:
   explicit TestOmniboxClient(Profile* profile)
       : profile_(profile),
         scheme_classifier_(profile) {}
   ~TestOmniboxClient() override {}
 
   // OmniboxClient:
-  scoped_ptr<AutocompleteProviderClient> CreateAutocompleteProviderClient()
+  std::unique_ptr<AutocompleteProviderClient> CreateAutocompleteProviderClient()
       override {
-    return make_scoped_ptr(new ChromeAutocompleteProviderClient(profile_));
+    return base::WrapUnique(new ChromeAutocompleteProviderClient(profile_));
   }
-  scoped_ptr<OmniboxNavigationObserver> CreateOmniboxNavigationObserver(
+  std::unique_ptr<OmniboxNavigationObserver> CreateOmniboxNavigationObserver(
       const base::string16& text,
       const AutocompleteMatch& match,
       const AutocompleteMatch& alternate_nav_match) override {
     return nullptr;
   }
   bool CurrentPageExists() const override { return true; }
   const GURL& GetURL() const override { return GURL::EmptyGURL(); }
   const base::string16& GetTitle() const override {
     return base::EmptyString16();
   }
@@ skipping 65 matching lines @@
     return omnibox_controller_->autocomplete_controller()->providers();
   }
 
  private:
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
-  scoped_ptr<TestOmniboxClient> omnibox_client_;
-  scoped_ptr<OmniboxController> omnibox_controller_;
+  std::unique_ptr<TestOmniboxClient> omnibox_client_;
+  std::unique_ptr<OmniboxController> omnibox_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxControllerTest);
 };
 
 OmniboxControllerTest::OmniboxControllerTest() {
 }
 
 OmniboxControllerTest::~OmniboxControllerTest() {
 }
 
@@ skipping 41 matching lines @@
   // Ensure we have at least one provider.
   ASSERT_NE(0, observed_providers);
 
   // Ensure instant extended includes all the provides in classic Chrome.
   int providers_with_instant_extended = observed_providers;
   // TODO(beaudoin): remove TYPE_SEARCH once it's no longer needed to pass
   // the Instant suggestion through via FinalizeInstantQuery.
   CreateController();
   AssertProviders(providers_with_instant_extended);
 }