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

Unified Diff: chrome/browser/ui/bookmarks/recently_used_folders_combo_model_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
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_unittest.cc ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
index 952026fd0612485e6909743aca36fafad493b8a2..14d4425f011300294b5262804c451747fc9b9c9e 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
@@ -4,8 +4,9 @@
#include "chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h"
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "components/bookmarks/browser/bookmark_model.h"
@@ -64,7 +65,8 @@ RecentlyUsedFoldersComboModelTest::RecentlyUsedFoldersComboModelTest()
// Verifies there are no duplicate nodes in the model.
TEST_F(RecentlyUsedFoldersComboModelTest, NoDups) {
- scoped_ptr<BookmarkModel> bookmark_model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> bookmark_model(
+ TestBookmarkClient::CreateModel());
const BookmarkNode* new_node = bookmark_model->AddURL(
bookmark_model->bookmark_bar_node(), 0, base::ASCIIToUTF16("a"),
GURL("http://a"));
@@ -78,7 +80,8 @@ TEST_F(RecentlyUsedFoldersComboModelTest, NoDups) {
// Verifies that observers are notified on changes.
TEST_F(RecentlyUsedFoldersComboModelTest, NotifyObserver) {
- scoped_ptr<BookmarkModel> bookmark_model(TestBookmarkClient::CreateModel());
+ std::unique_ptr<BookmarkModel> bookmark_model(
+ TestBookmarkClient::CreateModel());
const BookmarkNode* folder = bookmark_model->AddFolder(
bookmark_model->bookmark_bar_node(), 0, base::ASCIIToUTF16("a"));
const BookmarkNode* sub_folder = bookmark_model->AddFolder(
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_unittest.cc ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698