Index: chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc |
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc |
index 7e5fa26a2fe19f9f7a5c80082c2febb56ca29768..ad43a41d3e5f2b4363ee94499a237c9b1a5a235d 100644 |
--- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc |
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc |
@@ -106,12 +106,12 @@ class BackFwdMenuModelTest : public ChromeRenderViewHostTestHarness { |
}; |
TEST_F(BackFwdMenuModelTest, BasicCase) { |
- scoped_ptr<BackForwardMenuModel> back_model(new BackForwardMenuModel( |
- NULL, BackForwardMenuModel::BACKWARD_MENU)); |
+ std::unique_ptr<BackForwardMenuModel> back_model( |
+ new BackForwardMenuModel(NULL, BackForwardMenuModel::BACKWARD_MENU)); |
back_model->set_test_web_contents(web_contents()); |
- scoped_ptr<BackForwardMenuModel> forward_model(new BackForwardMenuModel( |
- NULL, BackForwardMenuModel::FORWARD_MENU)); |
+ std::unique_ptr<BackForwardMenuModel> forward_model( |
+ new BackForwardMenuModel(NULL, BackForwardMenuModel::FORWARD_MENU)); |
forward_model->set_test_web_contents(web_contents()); |
EXPECT_EQ(0, back_model->GetItemCount()); |
@@ -174,12 +174,12 @@ TEST_F(BackFwdMenuModelTest, BasicCase) { |
} |
TEST_F(BackFwdMenuModelTest, MaxItemsTest) { |
- scoped_ptr<BackForwardMenuModel> back_model(new BackForwardMenuModel( |
- NULL, BackForwardMenuModel::BACKWARD_MENU)); |
+ std::unique_ptr<BackForwardMenuModel> back_model( |
+ new BackForwardMenuModel(NULL, BackForwardMenuModel::BACKWARD_MENU)); |
back_model->set_test_web_contents(web_contents()); |
- scoped_ptr<BackForwardMenuModel> forward_model(new BackForwardMenuModel( |
- NULL, BackForwardMenuModel::FORWARD_MENU)); |
+ std::unique_ptr<BackForwardMenuModel> forward_model( |
+ new BackForwardMenuModel(NULL, BackForwardMenuModel::FORWARD_MENU)); |
forward_model->set_test_web_contents(web_contents()); |
// Seed the controller with 32 URLs |
@@ -256,12 +256,12 @@ TEST_F(BackFwdMenuModelTest, MaxItemsTest) { |
} |
TEST_F(BackFwdMenuModelTest, ChapterStops) { |
- scoped_ptr<BackForwardMenuModel> back_model(new BackForwardMenuModel( |
- NULL, BackForwardMenuModel::BACKWARD_MENU)); |
+ std::unique_ptr<BackForwardMenuModel> back_model( |
+ new BackForwardMenuModel(NULL, BackForwardMenuModel::BACKWARD_MENU)); |
back_model->set_test_web_contents(web_contents()); |
- scoped_ptr<BackForwardMenuModel> forward_model(new BackForwardMenuModel( |
- NULL, BackForwardMenuModel::FORWARD_MENU)); |
+ std::unique_ptr<BackForwardMenuModel> forward_model( |
+ new BackForwardMenuModel(NULL, BackForwardMenuModel::FORWARD_MENU)); |
forward_model->set_test_web_contents(web_contents()); |
// Seed the controller with 32 URLs. |
@@ -467,8 +467,8 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) { |
} |
TEST_F(BackFwdMenuModelTest, EscapeLabel) { |
- scoped_ptr<BackForwardMenuModel> back_model(new BackForwardMenuModel( |
- NULL, BackForwardMenuModel::BACKWARD_MENU)); |
+ std::unique_ptr<BackForwardMenuModel> back_model( |
+ new BackForwardMenuModel(NULL, BackForwardMenuModel::BACKWARD_MENU)); |
back_model->set_test_web_contents(web_contents()); |
EXPECT_EQ(0, back_model->GetItemCount()); |
@@ -501,7 +501,7 @@ TEST_F(BackFwdMenuModelTest, FaviconLoadTest) { |
ASSERT_TRUE(profile()->CreateHistoryService(true, false)); |
profile()->CreateFaviconService(); |
Browser::CreateParams native_params(profile()); |
- scoped_ptr<Browser> browser( |
+ std::unique_ptr<Browser> browser( |
chrome::CreateBrowserWithTestWindowForParams(&native_params)); |
FaviconDelegate favicon_delegate; |