| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/common/chrome_switches.h" | 7 #include "chrome/common/chrome_switches.h" |
| 8 | 8 |
| 9 #if defined(TOOLKIT_VIEWS) | 9 #if defined(TOOLKIT_VIEWS) |
| 10 #if defined (OS_WIN) |
| 11 #define MAYBE_Infobars Infobars |
| 12 #else |
| 13 // Flaky on ChromeOS, see http://crbug.com/40141. |
| 14 #define MAYBE_Infobars FLAKY_Infobars |
| 15 #endif |
| 16 |
| 17 #else |
| 10 // Need to port ExtensionInfoBarDelegate::CreateInfoBar() to other platforms. | 18 // Need to port ExtensionInfoBarDelegate::CreateInfoBar() to other platforms. |
| 11 // See http://crbug.com/39916 for details. | 19 // See http://crbug.com/39916 for details. |
| 12 #define MAYBE_Infobars Infobars | |
| 13 #else | |
| 14 #define MAYBE_Infobars DISABLED_Infobars | 20 #define MAYBE_Infobars DISABLED_Infobars |
| 15 #endif | 21 #endif |
| 16 | 22 |
| 17 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Infobars) { | 23 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Infobars) { |
| 18 // TODO(finnur): Remove once infobars are no longer experimental (bug 39511). | 24 // TODO(finnur): Remove once infobars are no longer experimental (bug 39511). |
| 19 CommandLine::ForCurrentProcess()->AppendSwitch( | 25 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 20 switches::kEnableExperimentalExtensionApis); | 26 switches::kEnableExperimentalExtensionApis); |
| 21 | 27 |
| 22 ASSERT_TRUE(RunExtensionTest("infobars")) << message_; | 28 ASSERT_TRUE(RunExtensionTest("infobars")) << message_; |
| 23 } | 29 } |
| OLD | NEW |