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

Unified Diff: chrome/browser/ui/tabs/pinned_tab_service_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/tabs/pinned_tab_codec.cc ('k') | chrome/browser/ui/tabs/tab_strip_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(&params));
// Close the browser. This should trigger saving the tabs. No need to destroy
« no previous file with comments | « chrome/browser/ui/tabs/pinned_tab_codec.cc ('k') | chrome/browser/ui/tabs/tab_strip_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698