| 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 "net/base/mock_host_resolver.h" | 7 #include "net/base/mock_host_resolver.h" |
| 8 | 8 |
| 9 // Sometimes this test fails on Linux: crbug.com/130138 | 9 // Sometimes this test fails on Linux: crbug.com/130138 |
| 10 #if defined(OS_LINUX) || defined(OS_CHROMEOS) | 10 #if defined(OS_LINUX) || defined(OS_CHROMEOS) |
| 11 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Idle) { | 11 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Idle) { |
| 12 #else | 12 #else |
| 13 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Idle) { | 13 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Idle) { |
| 14 #endif | 14 #endif |
| 15 ASSERT_TRUE(RunExtensionTest("idle")) << message_; | 15 ASSERT_TRUE(RunExtensionTest("idle")) << message_; |
| 16 } | 16 } |
| OLD | NEW |