| Index: chrome/browser/task_manager/task_manager_browsertest.cc
|
| diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
|
| index c595e0e4784f4d2a951fd9630c67b7bdd5005f7b..4ebe53da14c0d2117eb403ba00079e4474d7c5ad 100644
|
| --- a/chrome/browser/task_manager/task_manager_browsertest.cc
|
| +++ b/chrome/browser/task_manager/task_manager_browsertest.cc
|
| @@ -1044,7 +1044,14 @@ IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest,
|
| ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, OrderingOfDependentRows) {
|
| +// Flaky on Linux http://crbug.com/700684
|
| +#if defined(OS_LINUX)
|
| +#define MAYBE_OrderingOfDependentRows DISABLED_OrderingOfDependentRows
|
| +#else
|
| +#define MAYBE_OrderingOfDependentRows OrderingOfDependentRows
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest,
|
| + MAYBE_OrderingOfDependentRows) {
|
| ShowTaskManager();
|
|
|
| GURL a_with_frames(embedded_test_server()->GetURL(
|
|
|