| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #define MAYBE_Infobars Infobars | 10 #define MAYBE_Infobars Infobars | 
| 11 #else | 11 #else | 
| 12 // Need to finish port to Linux. See http://crbug.com/39916 for details. | 12 // Need to finish port to Linux. See http://crbug.com/39916 for details. | 
| 13 // Also disabled on mac.  See http://crbug.com/60990. | 13 // Also disabled on mac.  See http://crbug.com/60990. | 
| 14 #define MAYBE_Infobars DISABLED_Infobars | 14 #define MAYBE_Infobars DISABLED_Infobars | 
| 15 #endif | 15 #endif | 
| 16 | 16 | 
| 17 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Infobars) { | 17 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Infobars) { | 
| 18   // TODO(finnur): Remove once infobars are no longer experimental (bug 39511). |  | 
| 19   CommandLine::ForCurrentProcess()->AppendSwitch( |  | 
| 20       switches::kEnableExperimentalExtensionApis); |  | 
| 21 |  | 
| 22   ASSERT_TRUE(RunExtensionTest("infobars")) << message_; | 18   ASSERT_TRUE(RunExtensionTest("infobars")) << message_; | 
| 23 } | 19 } | 
| OLD | NEW | 
|---|