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

Unified Diff: ash/metrics/desktop_task_switch_metric_recorder_unittest.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: cleanup Created 3 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
Index: ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
diff --git a/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc b/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
index 60ae8fea14e01c14c3c25f15da3af66040472e10..8cf633678dbfbf2fc8624f8a5c8eb0abe53040aa 100644
--- a/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
+++ b/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm_shell.h"
#include "base/test/user_action_tester.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/window.h"
@@ -121,7 +121,7 @@ DesktopTaskSwitchMetricRecorderTest::CreateNonPositionableWindow() const {
TEST_F(DesktopTaskSwitchMetricRecorderTest,
ActivatePositionableWindowWhenNullWindowWasActivatedLast) {
// TODO: investigate failure in mash, http://crbug.com/695628.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
std::unique_ptr<aura::Window> null_window;
@@ -141,7 +141,7 @@ TEST_F(
DesktopTaskSwitchMetricRecorderTest,
ActivatePositionableWindowWhenADifferentPositionableWindowWasActivatedLast) {
// TODO: investigate failure in mash, http://crbug.com/695628.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
std::unique_ptr<aura::Window> positionable_window_1 =
@@ -176,7 +176,7 @@ TEST_F(
TEST_F(DesktopTaskSwitchMetricRecorderTest,
ActivatePositionableWindowWhenANonPositionableWindowWasActivatedLast) {
// TODO: investigate failure in mash, http://crbug.com/695628.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
std::unique_ptr<aura::Window> non_positionable_window =
@@ -321,7 +321,7 @@ aura::Window* DesktopTaskSwitchMetricRecorderWithShellIntegrationTest::
TEST_F(DesktopTaskSwitchMetricRecorderWithShellIntegrationTest,
ActivatePositionableWindowWithInputEvent) {
// TODO: investigate failure in mash, http://crbug.com/695628.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
aura::Window* positionable_window =
CreatePositionableWindowInShellWithBounds(gfx::Rect(0, 0, 10, 10));

Powered by Google App Engine
This is Rietveld 408576698