chrome/browser/ui/views/menu_model_adapter_test.cc - Issue 10409027: Disable or mark flaky several UI tests on Win

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/menu_model_adapter_test.cc

Issue 10409027: Disable or mark flaky several UI tests on Win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Updated Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/menu_item_view_test.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/callback.h"	5 #include "base/callback.h"

6 #include "base/utf_string_conversions.h"	6 #include "base/utf_string_conversions.h"

7 #include "chrome/test/base/view_event_test_base.h"	7 #include "chrome/test/base/view_event_test_base.h"

8 #include "chrome/test/base/ui_test_utils.h"	8 #include "chrome/test/base/ui_test_utils.h"

9 #include "ui/base/models/menu_model.h"	9 #include "ui/base/models/menu_model.h"

10 #include "ui/ui_controls/ui_controls.h"	10 #include "ui/ui_controls/ui_controls.h"

(...skipping 371 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
382 views::ViewsDelegate* old_views_delegate_;	382 views::ViewsDelegate* old_views_delegate_;

383 TestViewsDelegate views_delegate_;	383 TestViewsDelegate views_delegate_;

384	384

385 views::MenuButton* button_;	385 views::MenuButton* button_;

386 TopMenuModel top_menu_model_;	386 TopMenuModel top_menu_model_;

387 views::MenuModelAdapter menu_model_adapter_;	387 views::MenuModelAdapter menu_model_adapter_;

388 views::MenuItemView* menu_;	388 views::MenuItemView* menu_;

389 scoped_ptr<views::MenuRunner> menu_runner_;	389 scoped_ptr<views::MenuRunner> menu_runner_;

390 };	390 };

391	391

392 VIEW_TEST(MenuModelAdapterTest, RebuildMenu)	392 #if defined(OS_WIN)

	393 #define MAYBE_RebuildMenu DISABLED_RebuildMenu

	394 #else

	395 #define MAYBE_RebuildMenu RebuildMenu

	396 #endif

	397 VIEW_TEST(MenuModelAdapterTest, MAYBE_RebuildMenu)

OLD	NEW