| Index: chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
|
| diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
|
| index 695cc5877cb88751d3df2900b7241426bb08c899..ac333ab00dc839591bdad89cf4522fd7cdb197cb 100644
|
| --- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
|
| +++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
|
| @@ -66,8 +66,17 @@ IN_PROC_BROWSER_TEST_F(BrowserGuestSessionNavigatorTest,
|
|
|
| // Test that in multi user environments a newly created browser gets created
|
| // on the same desktop as the browser is shown on.
|
| +//
|
| +// Flakily hits assert: http://crbug.com/469717
|
| +#if !defined(NDEBUG)
|
| +#define MAYBE_Browser_Gets_Created_On_Visiting_Desktop \
|
| + DISABLED_Browser_Gets_Created_On_Visiting_Desktop
|
| +#else
|
| +#define MAYBE_Browser_Gets_Created_On_Visiting_Desktop \
|
| + Browser_Gets_Created_On_Visiting_Desktop
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(BrowserGuestSessionNavigatorTest,
|
| - Browser_Gets_Created_On_Visiting_Desktop) {
|
| + MAYBE_Browser_Gets_Created_On_Visiting_Desktop) {
|
| // Test 1: Test that a browser created from a visiting browser will be on the
|
| // same visiting desktop.
|
| {
|
|
|