| Index: chrome/browser/extensions/api/automation/automation_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc
|
| index 18d62a77d002bf9ee9d997f0c913056c72fa0833..dc7caf77db744362f5cd3ff805720ce766c1ef76 100644
|
| --- a/chrome/browser/extensions/api/automation/automation_apitest.cc
|
| +++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
|
| @@ -187,6 +187,12 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, Find) {
|
| << message_;
|
| }
|
|
|
| +// Flaky on Linux only. http://crbug.com/467921
|
| +#if defined(OS_LINUX)
|
| +#define MAYBE_Mixins DISABLED_Mixins
|
| +#else
|
| +#define MAYBE_Mixins Mixins
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(AutomationApiTest, Mixins) {
|
| StartEmbeddedTestServer();
|
| ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "mixins.html"))
|
|
|