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

Unified Diff: ash/shelf/shelf_view_unittest.cc

Issue 2060003002: ash: Add a unit test for the system update tray item (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movetraydelegate
Patch Set: rebase Created 4 years, 6 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/ash.gyp ('k') | ash/system/tray/system_tray.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view_unittest.cc
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index 59703975c0a7156b6a3600ef0b902aac8494c010..6b67adf87b0fbbde589cfc6dfb895f181282f2f4 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -30,6 +30,7 @@
#include "ash/test/shell_test_api.h"
#include "ash/test/test_shelf_delegate.h"
#include "ash/test/test_shelf_item_delegate.h"
+#include "ash/test/test_system_tray_delegate.h"
#include "base/compiler_specific.h"
#include "base/i18n/rtl.h"
#include "base/run_loop.h"
@@ -1943,7 +1944,13 @@ TEST_F(ShelfViewTest,
class ShelfViewVisibleBoundsTest : public ShelfViewTest,
public testing::WithParamInterface<bool> {
public:
- ShelfViewVisibleBoundsTest() : text_direction_change_(GetParam()) {}
+ ShelfViewVisibleBoundsTest() : text_direction_change_(GetParam()) {
+ // TODO(jamescook): This test fails unless the system update icon is
+ // showing, which used to be the default. However, it only fails on the
+ // trybots, and only in the case where the overflow button is showing.
+ // See http://crbug.com/619344
+ TestSystemTrayDelegate::SetSystemUpdateRequired(true);
+ }
void CheckAllItemsAreInBounds() {
gfx::Rect visible_bounds = shelf_view_->GetVisibleItemsBoundsInScreen();
« no previous file with comments | « ash/ash.gyp ('k') | ash/system/tray/system_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698