Index: chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc |
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc |
index 4cf9bf1644ba23386c80ec975d8f1dca3aa277b2..5045a15f5f7b88ee2948f0dcdebcad51b6ab8d75 100644 |
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc |
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc |
@@ -6,9 +6,9 @@ |
#include <stddef.h> |
+#include <memory> |
#include <string> |
-#include "base/memory/scoped_ptr.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/values.h" |
#include "chrome/app/chrome_command_ids.h" |
@@ -90,7 +90,7 @@ class BookmarkContextMenuControllerTest : public testing::Test { |
protected: |
content::TestBrowserThreadBundle thread_bundle_; |
- scoped_ptr<TestingProfile> profile_; |
+ std::unique_ptr<TestingProfile> profile_; |
BookmarkModel* model_; |
TestingPageNavigator navigator_; |
}; |
@@ -304,9 +304,9 @@ TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) { |
const BookmarkNode* bb_node = model_->bookmark_bar_node(); |
std::vector<const BookmarkNode*> nodes; |
nodes.push_back(bb_node->GetChild(0)); |
- scoped_ptr<BookmarkContextMenuController> controller( |
- new BookmarkContextMenuController( |
- NULL, NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes)); |
+ std::unique_ptr<BookmarkContextMenuController> controller( |
+ new BookmarkContextMenuController(NULL, NULL, NULL, profile_.get(), NULL, |
+ nodes[0]->parent(), nodes)); |
EXPECT_TRUE(controller->IsCommandIdEnabled(IDC_COPY)); |
EXPECT_TRUE(controller->IsCommandIdEnabled(IDC_CUT)); |