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

Unified Diff: ash/common/shelf/shelf_tooltip_manager_unittest.cc

Issue 2713923002: chromeos: moves a bunch of tests to common_unittests (Closed)
Patch Set: feedback Created 3 years, 10 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/shelf/shelf_tooltip_manager_unittest.cc
diff --git a/ash/common/shelf/shelf_tooltip_manager_unittest.cc b/ash/common/shelf/shelf_tooltip_manager_unittest.cc
index 268626e50f9621823c26e0ae7810e533c438d0cf..955301fd60c7f4d7419f8c166c81864768efaab3 100644
--- a/ash/common/shelf/shelf_tooltip_manager_unittest.cc
+++ b/ash/common/shelf/shelf_tooltip_manager_unittest.cc
@@ -9,6 +9,7 @@
#include "ash/common/shelf/shelf_view.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/test/test_shelf_item_delegate.h"
+#include "ash/common/wm_shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shelf_view_test_api.h"
#include "base/memory/ptr_util.h"
@@ -165,6 +166,10 @@ TEST_F(ShelfTooltipManagerTest, HideWhenShelfIsAutoHideHidden) {
}
TEST_F(ShelfTooltipManagerTest, HideForEvents) {
+ // TODO: investigate failure in mash. http://crbug.com/695563.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
ui::test::EventGenerator& generator = GetEventGenerator();
gfx::Rect shelf_bounds = shelf_view_->GetBoundsInScreen();
@@ -197,6 +202,10 @@ TEST_F(ShelfTooltipManagerTest, HideForEvents) {
}
TEST_F(ShelfTooltipManagerTest, HideForExternalEvents) {
+ // TODO: investigate failure in mash. http://crbug.com/695563.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
ui::test::EventGenerator& generator = GetEventGenerator();
// Should hide for touches outside the shelf.
« no previous file with comments | « ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc ('k') | ash/common/shelf/shelf_window_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698