Index: chrome/browser/ui/tabs/pinned_tab_service_unittest.cc |
diff --git a/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc b/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc |
index f6cd4b5d1e7d7161d74ffe1ebc0f582f03b72d63..31c44e8095d25364cf1fcb139ce89ee4563e660b 100644 |
--- a/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc |
+++ b/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc |
@@ -2,15 +2,17 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "chrome/browser/ui/tabs/pinned_tab_service.h" |
+ |
+#include <memory> |
#include <string> |
#include <vector> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
+#include "base/memory/ptr_util.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_tabstrip.h" |
#include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
-#include "chrome/browser/ui/tabs/pinned_tab_service.h" |
#include "chrome/browser/ui/tabs/pinned_tab_service_factory.h" |
#include "chrome/browser/ui/tabs/pinned_tab_test_utils.h" |
#include "chrome/browser/ui/tabs/tab_strip_model.h" |
@@ -20,9 +22,9 @@ |
namespace { |
-scoped_ptr<KeyedService> BuildPinnedTabService( |
+std::unique_ptr<KeyedService> BuildPinnedTabService( |
content::BrowserContext* profile) { |
- return make_scoped_ptr(new PinnedTabService(static_cast<Profile*>(profile))); |
+ return base::WrapUnique(new PinnedTabService(static_cast<Profile*>(profile))); |
} |
PinnedTabService* BuildForProfile(Profile* profile) { |
@@ -56,7 +58,7 @@ TEST_F(PinnedTabServiceTest, Popup) { |
// Create a popup. |
Browser::CreateParams params(Browser::TYPE_POPUP, profile()); |
- scoped_ptr<Browser> popup( |
+ std::unique_ptr<Browser> popup( |
chrome::CreateBrowserWithTestWindowForParams(¶ms)); |
// Close the browser. This should trigger saving the tabs. No need to destroy |