Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Unified Diff: chrome/browser/ui/omnibox/omnibox_controller_unittest.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/omnibox/omnibox_controller_unittest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc b/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc
index 0c614200e442f9951c920bf5a2f8bf77bbd15dd5..d0c31dec53e774be82afd09e69f7101c37ab16e8 100644
--- a/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc
@@ -5,6 +5,7 @@
#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"
@@ -26,11 +27,11 @@ class TestOmniboxClient : public OmniboxClient {
~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 {
@@ -116,8 +117,8 @@ class OmniboxControllerTest : public testing::Test {
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);
};
« no previous file with comments | « chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h ('k') | chrome/browser/ui/omnibox/omnibox_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698