ash/shelf/shelf_window_watcher_unittest.cc - Issue 2183483002: Clean up ash::ShellTestApi

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: ash/shelf/shelf_window_watcher_unittest.cc

Issue 2183483002: Clean up ash::ShellTestApi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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:

Index: ash/shelf/shelf_window_watcher_unittest.cc

diff --git a/ash/shelf/shelf_window_watcher_unittest.cc b/ash/shelf/shelf_window_watcher_unittest.cc

index 989363d5f62ff944385f8cc5e34c4da986d2c07d..606e7be629fb3eecc6f97c8ef20285e59da66bb2 100644

--- a/ash/shelf/shelf_window_watcher_unittest.cc

+++ b/ash/shelf/shelf_window_watcher_unittest.cc

@@ -11,10 +11,10 @@

#include "ash/common/shell_window_ids.h"

#include "ash/common/wm/window_resizer.h"

#include "ash/common/wm/window_state.h"

+#include "ash/common/wm_shell.h"

#include "ash/shelf/shelf_util.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

-#include "ash/test/shell_test_api.h"

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_util.h"

#include "base/command_line.h"

@@ -31,7 +31,7 @@ class ShelfWindowWatcherTest : public test::AshTestBase {

void SetUp() override {

test::AshTestBase::SetUp();

- model_ = test::ShellTestApi(Shell::GetInstance()).shelf_model();

+ model_ = WmShell::Get()->shelf_model();

}

void TearDown() override {

« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/test/shell_test_api.h » ('j') | no next file with comments »