chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc - Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc

Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/login/users/wallpaper/wallpaper_manager.cc ('k') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc

diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc

index 8b43b4c4c642268f3ced2d50be0cd8900955a631..bd3d1d26e8184eb5ec1826e4dea14af6d77aca24 100644

--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc

+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc

@@ -157,11 +157,11 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest {

ash::DesktopBackgroundController* controller_;

PrefService* local_state_;

- scoped_ptr<base::CommandLine> wallpaper_manager_command_line_;

+ std::unique_ptr<base::CommandLine> wallpaper_manager_command_line_;

// Directory created by CreateCmdlineWallpapers () to store default

// wallpaper images.

- scoped_ptr<base::ScopedTempDir> wallpaper_dir_;

+ std::unique_ptr<base::ScopedTempDir> wallpaper_dir_;

const AccountId test_account_id1_ = AccountId::FromUserEmail(kTestUser1);

const AccountId test_account_id2_ = AccountId::FromUserEmail(kTestUser2);

@@ -515,7 +515,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCacheUpdate,

wallpaper_manager->SetUserWallpaperInfo(test_account_id1_, info, true);

wallpaper_manager->SetUserWallpaperNow(test_account_id1_);

wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();

- scoped_ptr<WallpaperManager::TestApi> test_api;

+ std::unique_ptr<WallpaperManager::TestApi> test_api;

test_api.reset(new WallpaperManager::TestApi(wallpaper_manager));

// Verify SetUserWallpaperNow updates wallpaper cache.

gfx::ImageSkia cached_wallpaper;

@@ -543,7 +543,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCacheUpdate,

// (simulate DesktopBackgroundController::UpdateDisplay()).

wallpaper_manager->UpdateWallpaper(true);

wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();

- scoped_ptr<WallpaperManager::TestApi> test_api;

+ std::unique_ptr<WallpaperManager::TestApi> test_api;

test_api.reset(new WallpaperManager::TestApi(wallpaper_manager));

gfx::ImageSkia cached_wallpaper;

// Previous custom wallpaper should be cached after user login.