chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/exclusive_access/fullscreen_controller_state_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/exclusive_access/fullscreen_controller_state_test.h ('k') | chrome/browser/ui/extensions/application_launch.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc

diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc

index 77ae80d95b1ff1f1897167ce89ac9d26bd2edfc9..4ddb0b68dbc15c5bacaec1243849cb43388c1eec 100644

--- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc

+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc

@@ -485,7 +485,7 @@ TEST_F(FullscreenControllerStateUnitTest, ExitTabFullscreenViaDetachingTab) {

ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE));

ASSERT_TRUE(browser()->window()->IsFullscreen());

- scoped_ptr<content::WebContents> web_contents(

+ std::unique_ptr<content::WebContents> web_contents(

browser()->tab_strip_model()->DetachWebContentsAt(0));

ChangeWindowFullscreenState();

EXPECT_FALSE(browser()->window()->IsFullscreen());

@@ -502,9 +502,8 @@ TEST_F(FullscreenControllerStateUnitTest, ExitTabFullscreenViaReplacingTab) {

content::WebContents* new_web_contents = content::WebContents::Create(

content::WebContents::CreateParams(profile()));

- scoped_ptr<content::WebContents> old_web_contents(

- browser()->tab_strip_model()->ReplaceWebContentsAt(

- 0, new_web_contents));

+ std::unique_ptr<content::WebContents> old_web_contents(

+ browser()->tab_strip_model()->ReplaceWebContentsAt(0, new_web_contents));

ChangeWindowFullscreenState();

EXPECT_FALSE(browser()->window()->IsFullscreen());

}

@@ -830,8 +829,9 @@ TEST_F(FullscreenControllerStateUnitTest,

EXPECT_FALSE(GetFullscreenController()->IsWindowFullscreenForTabOrPending());

// Create the second browser window.

- const scoped_ptr<BrowserWindow> second_browser_window(CreateBrowserWindow());

- const scoped_ptr<Browser> second_browser(

+ const std::unique_ptr<BrowserWindow> second_browser_window(

+ CreateBrowserWindow());

+ const std::unique_ptr<Browser> second_browser(

CreateBrowser(browser()->profile(), browser()->type(), false,

second_browser_window.get()));

AddTab(second_browser.get(), GURL(url::kAboutBlankURL));