| Index: ash/shelf/shelf_layout_manager_unittest.cc | 
| diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc | 
| index 1118fdac5cf08a31c5fba89594bac5da8ff2544f..4cf3d74515f43abf6f2b94ce43708caf8c44c38b 100644 | 
| --- a/ash/shelf/shelf_layout_manager_unittest.cc | 
| +++ b/ash/shelf/shelf_layout_manager_unittest.cc | 
| @@ -1748,9 +1748,19 @@ TEST_F(ShelfLayoutManagerTest, Dimming) { | 
| EXPECT_FALSE(shelf_widget->GetDimsShelf()); | 
| } | 
|  | 
| +// This test fails on Windows (likely due to hard-coded pointer coordinate | 
| +// arithmetic), but the Windows ash shell isn't supported any more so it's | 
| +// probably not worth fixing. Also note that this test uses system tray | 
| +// notification bubbles, which needn't exist: see crbug.com/630641 | 
| +#if defined(OS_WIN) | 
| +#define MAYBE_BubbleEnlargesShelfMouseHitArea \ | 
| +  DISABLED_BubbleEnlargesShelfMouseHitArea | 
| +#else | 
| +#define MAYBE_BubbleEnlargesShelfMouseHitArea BubbleEnlargesShelfMouseHitArea | 
| +#endif | 
| // Make sure that the shelf will not hide if the mouse is between a bubble and | 
| // the shelf. | 
| -TEST_F(ShelfLayoutManagerTest, BubbleEnlargesShelfMouseHitArea) { | 
| +TEST_F(ShelfLayoutManagerTest, MAYBE_BubbleEnlargesShelfMouseHitArea) { | 
| WmShelf* shelf = GetPrimaryShelf(); | 
| ShelfLayoutManager* layout_manager = GetShelfLayoutManager(); | 
| StatusAreaWidget* status_area_widget = | 
|  |