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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_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/views/bookmarks/bookmark_bar_view_unittest.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
index 6bc7eed3299cc7eaea5709c9808c912da018515a..f9f9b649764dbec31cf25717d57fb87c1e1f1185 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
@@ -4,8 +4,10 @@
#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -119,19 +121,20 @@ class BookmarkBarViewTest : public BrowserWithTestWindowTest {
return profile;
}
- scoped_ptr<BookmarkBarViewTestHelper> test_helper_;
- scoped_ptr<BookmarkBarView> bookmark_bar_view_;
+ std::unique_ptr<BookmarkBarViewTestHelper> test_helper_;
+ std::unique_ptr<BookmarkBarView> bookmark_bar_view_;
private:
- static scoped_ptr<KeyedService> CreateTemplateURLService(
+ static std::unique_ptr<KeyedService> CreateTemplateURLService(
content::BrowserContext* profile) {
- return make_scoped_ptr(new TemplateURLService(
- static_cast<Profile*>(profile)->GetPrefs(),
- make_scoped_ptr(new SearchTermsData), NULL,
- scoped_ptr<TemplateURLServiceClient>(), NULL, NULL, base::Closure()));
+ return base::WrapUnique(
+ new TemplateURLService(static_cast<Profile*>(profile)->GetPrefs(),
+ base::WrapUnique(new SearchTermsData), NULL,
+ std::unique_ptr<TemplateURLServiceClient>(),
+ NULL, NULL, base::Closure()));
}
- scoped_ptr<ScopedTestingLocalState> local_state_;
+ std::unique_ptr<ScopedTestingLocalState> local_state_;
DISALLOW_COPY_AND_ASSIGN(BookmarkBarViewTest);
};

Powered by Google App Engine
This is Rietveld 408576698