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

Unified Diff: ash/common/system/chromeos/palette/tools/create_note_unittest.cc

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)
Patch Set: merge Created 3 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
Index: ash/common/system/chromeos/palette/tools/create_note_unittest.cc
diff --git a/ash/common/system/chromeos/palette/tools/create_note_unittest.cc b/ash/common/system/chromeos/palette/tools/create_note_unittest.cc
index 3ff21b290a57a05d49a5f78b72a6d2a9bb4720a8..d8af84ce3a9dddcba30c909191507615c346d346 100644
--- a/ash/common/system/chromeos/palette/tools/create_note_unittest.cc
+++ b/ash/common/system/chromeos/palette/tools/create_note_unittest.cc
@@ -7,8 +7,9 @@
#include "ash/common/system/chromeos/palette/palette_tool.h"
#include "ash/common/system/chromeos/palette/tools/create_note_action.h"
#include "ash/common/test/test_palette_delegate.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
+#include "ash/test/shell_test_api.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "ui/views/view.h"
@@ -26,7 +27,7 @@ class CreateNoteTest : public test::AshTestBase {
void SetUp() override {
test::AshTestBase::SetUp();
- WmShell::Get()->SetPaletteDelegateForTesting(
+ test::ShellTestApi().SetPaletteDelegate(
base::MakeUnique<TestPaletteDelegate>());
palette_tool_delegate_ = base::MakeUnique<MockPaletteToolDelegate>();
@@ -35,7 +36,7 @@ class CreateNoteTest : public test::AshTestBase {
TestPaletteDelegate* test_palette_delegate() {
return static_cast<TestPaletteDelegate*>(
- WmShell::Get()->palette_delegate());
+ Shell::GetInstance()->palette_delegate());
}
protected:

Powered by Google App Engine
This is Rietveld 408576698