| Index: chrome/browser/extensions/extension_tabs_apitest.cc
|
| diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
|
| index 8702a36942cc2de33a0f923ecb30462c7900f286..45d92331e817c012cf25423742bcff1c5ba714f2 100644
|
| --- a/chrome/browser/extensions/extension_tabs_apitest.cc
|
| +++ b/chrome/browser/extensions/extension_tabs_apitest.cc
|
| @@ -17,6 +17,14 @@
|
| #define MAYBE_Tabs Tabs
|
| #endif
|
|
|
| +// TabOnRemoved is flaky on chromeos and linux views debug build.
|
| +// http://crbug.com/49258
|
| +#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) && !defined(NDEBUG)
|
| +#define MAYBE_TabOnRemoved FLAKY_TabOnRemoved
|
| +#else
|
| +#define MAYBE_TabOnRemoved TabOnRemoved
|
| +#endif
|
| +
|
|
|
| IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) {
|
| ASSERT_TRUE(StartHTTPServer());
|
| @@ -40,7 +48,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabConnect) {
|
| ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_;
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabOnRemoved) {
|
| +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabOnRemoved) {
|
| ASSERT_TRUE(StartHTTPServer());
|
| ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_;
|
| }
|
|
|