| Index: chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
|
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
|
| index ffaa0eb51f121e549b723af61a889fc09e0ba59a..955862405813d3dc98a849719c3f2466800fc203 100644
|
| --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
|
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
|
| @@ -6,11 +6,11 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/threading/sequenced_worker_pool.h"
|
| #include "base/values.h"
|
| @@ -83,7 +83,7 @@ class BookmarkContextMenuTest : public testing::Test {
|
|
|
| protected:
|
| content::TestBrowserThreadBundle thread_bundle_;
|
| - scoped_ptr<TestingProfile> profile_;
|
| + std::unique_ptr<TestingProfile> profile_;
|
| BookmarkModel* model_;
|
| TestingPageNavigator navigator_;
|
|
|
| @@ -305,7 +305,7 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
|
| const BookmarkNode* bb_node = model_->bookmark_bar_node();
|
| std::vector<const BookmarkNode*> nodes;
|
| nodes.push_back(bb_node->GetChild(0));
|
| - scoped_ptr<BookmarkContextMenu> controller(new BookmarkContextMenu(
|
| + std::unique_ptr<BookmarkContextMenu> controller(new BookmarkContextMenu(
|
| NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false));
|
| EXPECT_TRUE(controller->IsCommandEnabled(IDC_COPY));
|
| EXPECT_TRUE(controller->IsCommandEnabled(IDC_CUT));
|
| @@ -338,7 +338,7 @@ TEST_F(BookmarkContextMenuTest, ShowManagedBookmarks) {
|
| const BookmarkNode* bb_node = model_->bookmark_bar_node();
|
| std::vector<const BookmarkNode*> nodes;
|
| nodes.push_back(bb_node->GetChild(0));
|
| - scoped_ptr<BookmarkContextMenu> controller(new BookmarkContextMenu(
|
| + std::unique_ptr<BookmarkContextMenu> controller(new BookmarkContextMenu(
|
| NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false));
|
|
|
| // Verify that there are no managed nodes yet.
|
|
|