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

Unified Diff: chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm

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
Index: chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
index 4f332a79ff888e05f06e240364d0b0931cfccb3a..5a8af921e6749750c17bf42eb90fe0d9d29b481e 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
@@ -2,13 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
+
+#include <memory>
+
#include "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_util.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/fullscreen.h"
#include "chrome/browser/ui/bookmarks/bookmark_utils.h"
-#import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
#import "chrome/browser/ui/cocoa/browser_window_controller.h"
#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
#include "chrome/grit/generated_resources.h"
@@ -39,7 +41,7 @@ class BrowserWindowCocoaTest : public CocoaProfileTest {
};
TEST_F(BrowserWindowCocoaTest, TestBookmarkBarVisible) {
- scoped_ptr<BrowserWindowCocoa> bwc(
+ std::unique_ptr<BrowserWindowCocoa> bwc(
new BrowserWindowCocoa(browser(), controller_));
bool before = bwc->IsBookmarkBarVisible();
@@ -51,7 +53,7 @@ TEST_F(BrowserWindowCocoaTest, TestBookmarkBarVisible) {
}
TEST_F(BrowserWindowCocoaTest, TestWindowTitle) {
- scoped_ptr<BrowserWindowCocoa> bwc(
+ std::unique_ptr<BrowserWindowCocoa> bwc(
new BrowserWindowCocoa(browser(), controller_));
NSString* playing_emoji = @"🔊";
NSString* muting_emoji = @"🔇";
@@ -75,7 +77,7 @@ TEST_F(BrowserWindowCocoaTest, TestWindowTitle) {
// Test that IsMaximized() returns false when the browser window goes from
// maximized to minimized state - http://crbug/452976.
TEST_F(BrowserWindowCocoaTest, TestMinimizeState) {
- scoped_ptr<BrowserWindowCocoa> bwc(
+ std::unique_ptr<BrowserWindowCocoa> bwc(
new BrowserWindowCocoa(browser(), controller_));
EXPECT_FALSE(bwc->IsMinimized());

Powered by Google App Engine
This is Rietveld 408576698