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

Unified Diff: ash/display/display_configuration_controller_unittest.cc

Issue 2815043002: Removes ShellPort::IsRunningInMash() (Closed)
Patch Set: dont set instance_ in constructor 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
« no previous file with comments | « ash/autoclick/autoclick_unittest.cc ('k') | ash/laser/laser_pointer_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_configuration_controller_unittest.cc
diff --git a/ash/display/display_configuration_controller_unittest.cc b/ash/display/display_configuration_controller_unittest.cc
index 13f9f84c377622a98d42468f83c71508370181c8..d1658af667d8dfe07f2cece874d62e604384af25 100644
--- a/ash/display/display_configuration_controller_unittest.cc
+++ b/ash/display/display_configuration_controller_unittest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/public/cpp/config.h"
#include "ash/rotator/screen_rotation_animator.h"
#include "ash/shell.h"
-#include "ash/shell_port.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/display_configuration_controller_test_api.h"
#include "base/macros.h"
@@ -17,7 +17,7 @@ using DisplayConfigurationControllerTest = test::AshTestBase;
TEST_F(DisplayConfigurationControllerTest, ErasesAnimatorOnAnimationEnded) {
// TODO(wutao): needs display_configuration_controller
// http://crbug.com/686839.
- if (ShellPort::Get()->IsRunningInMash())
+ if (Shell::GetAshConfig() == Config::MASH)
return;
display::Display display = display::Screen::GetScreen()->GetPrimaryDisplay();
« no previous file with comments | « ash/autoclick/autoclick_unittest.cc ('k') | ash/laser/laser_pointer_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698