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

Unified Diff: chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc

Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 6 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/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 54f7fbd47a3ac55312e8025c5180192d21fcc3e6..2a78f8598858d1ff84dca665ca825e3e9492ae7d 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -7,9 +7,7 @@
#include <memory>
#include "ash/common/wm/window_state.h"
-#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
#include "ash/wm/window_state_aura.h"
#include "base/command_line.h"
@@ -171,9 +169,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndManualUnminimizeWindows) {
class WallpaperPrivateApiMultiUserUnittest
: public WallpaperPrivateApiUnittest {
public:
- WallpaperPrivateApiMultiUserUnittest()
- : multi_user_window_manager_(NULL),
- session_state_delegate_(NULL) {}
+ WallpaperPrivateApiMultiUserUnittest(): multi_user_window_manager_(nullptr) {}
void SetUp() override;
void TearDown() override;
@@ -191,7 +187,6 @@ class WallpaperPrivateApiMultiUserUnittest
private:
chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager_;
- ash::test::TestSessionStateDelegate* session_state_delegate_;
DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateApiMultiUserUnittest);
};
@@ -199,9 +194,6 @@ class WallpaperPrivateApiMultiUserUnittest
void WallpaperPrivateApiMultiUserUnittest::SetUp() {
AshTestBase::SetUp();
WallpaperManager::Initialize();
- session_state_delegate_ =
- static_cast<ash::test::TestSessionStateDelegate*> (
- ash::Shell::GetInstance()->session_state_delegate());
fake_user_manager()->AddUser(test_account_id1_);
fake_user_manager()->AddUser(test_account_id2_);
}

Powered by Google App Engine
This is Rietveld 408576698