OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Popup) { | 9 // Flaky on windows. http://crbug.com/46601 |
| 10 #if defined(OS_WIN) |
| 11 #define MAYBE_Popup FLAKY_Popup |
| 12 #else |
| 13 #define MAYBE_Popup Popup |
| 14 #endif |
| 15 |
| 16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Popup) { |
10 CommandLine::ForCurrentProcess()->AppendSwitch( | 17 CommandLine::ForCurrentProcess()->AppendSwitch( |
11 switches::kEnableExperimentalExtensionApis); | 18 switches::kEnableExperimentalExtensionApis); |
12 CommandLine::ForCurrentProcess()->AppendSwitch( | 19 CommandLine::ForCurrentProcess()->AppendSwitch( |
13 switches::kEnableExtensionToolstrips); | 20 switches::kEnableExtensionToolstrips); |
14 | 21 |
15 ASSERT_TRUE(RunExtensionTest("popup")) << message_; | 22 ASSERT_TRUE(RunExtensionTest("popup")) << message_; |
16 } | 23 } |
OLD | NEW |