Chromium Code Reviews| Index: chrome/browser/sync/test/integration/enable_disable_test.cc |
| diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc |
| index d39871ceac0511cf83e7da221e4f019dede2d563..f7aed8d4b17454d82172011fcfe4e8ed3b366734 100644 |
| --- a/chrome/browser/sync/test/integration/enable_disable_test.cc |
| +++ b/chrome/browser/sync/test/integration/enable_disable_test.cc |
| @@ -158,7 +158,13 @@ class EnableDisableSingleClientTest : public SyncTest { |
| DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest); |
| }; |
| -IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) { |
| +#if defined(OS_CHROMEOS) |
| +// http://crbug.com/689662 |
|
skym
2017/03/10 18:13:20
I'd drop the http://
Also, to me this just looks
Gang Wu
2017/03/10 18:51:39
Done.
|
| +#define MAYBE_EnableOneAtATime DISABLED_EnableOneAtATime |
| +#else |
| +#define MAYBE_EnableOneAtATime EnableOneAtATime |
| +#endif |
| +IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, MAYBE_EnableOneAtATime) { |
| // Setup sync with no enabled types. |
| SetupTest(false); |
| @@ -180,7 +186,13 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) { |
| } |
| } |
| -IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) { |
| +#if defined(OS_CHROMEOS) |
| +// http://crbug.com/689662 |
| +#define MAYBE_DisableOneAtATime DISABLED_DisableOneAtATime |
| +#else |
| +#define MAYBE_DisableOneAtATime DisableOneAtATime |
| +#endif |
| +IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, MAYBE_DisableOneAtATime) { |
| // Setup sync with no disabled types. |
| SetupTest(true); |