chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc - Issue 1010443003: Make the lifetime of wallpaper manager more clear.

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/extensions/wallpaper_private_api_unittest.cc

Issue 1010443003: Make the lifetime of wallpaper manager more clear. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix the failed unittests. Created 5 years, 9 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/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/login/users/user_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc

diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc

index 13eb977f65f379a14e95730e0389e5c48b0b601d..fc2c66523851228d513607f4ccdd48f7cbf206ba 100644

--- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc

+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc

@@ -12,6 +12,7 @@

#include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"

#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"

#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"

+#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"

#include "ui/aura/test/test_windows.h"

@@ -203,6 +204,7 @@ class WallpaperPrivateApiMultiUserUnittest

void WallpaperPrivateApiMultiUserUnittest::SetUp() {

AshTestBase::SetUp();

+ WallpaperManager::Initialize();

session_state_delegate_ =

static_cast<ash::test::TestSessionStateDelegate*> (

ash::Shell::GetInstance()->session_state_delegate());

@@ -213,6 +215,7 @@ void WallpaperPrivateApiMultiUserUnittest::SetUp() {

void WallpaperPrivateApiMultiUserUnittest::TearDown() {

chrome::MultiUserWindowManager::DeleteInstance();

AshTestBase::TearDown();

+ WallpaperManager::Shutdown();

}

void WallpaperPrivateApiMultiUserUnittest::SetUpMultiUserWindowManager(