OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/extensions/api/system_cpu/cpu_info_provider.h" | 5 #include "chrome/browser/extensions/api/system_cpu/cpu_info_provider.h" |
6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
7 | 7 |
8 namespace extensions { | 8 namespace extensions { |
9 | 9 |
10 using api::system_cpu::CpuInfo; | 10 using api::system_cpu::CpuInfo; |
(...skipping 16 matching lines...) Expand all Loading... |
27 class SystemCpuApiTest: public ExtensionApiTest { | 27 class SystemCpuApiTest: public ExtensionApiTest { |
28 public: | 28 public: |
29 SystemCpuApiTest() {} | 29 SystemCpuApiTest() {} |
30 virtual ~SystemCpuApiTest() {} | 30 virtual ~SystemCpuApiTest() {} |
31 | 31 |
32 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 32 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
33 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); | 33 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); |
34 } | 34 } |
35 }; | 35 }; |
36 | 36 |
37 IN_PROC_BROWSER_TEST_F(SystemCpuApiTest, Cpu) { | 37 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |
| 38 // TODO(erg): linux_aura bringup: http://crbug.com/163931 |
| 39 #define MAYBE_Cpu DISABLED_Cpu |
| 40 #else |
| 41 #define MAYBE_Cpu Cpu |
| 42 #endif |
| 43 |
| 44 IN_PROC_BROWSER_TEST_F(SystemCpuApiTest, MAYBE_Cpu) { |
38 CpuInfoProvider* provider = new MockCpuInfoProviderImpl(); | 45 CpuInfoProvider* provider = new MockCpuInfoProviderImpl(); |
39 // The provider is owned by the single CpuInfoProvider instance. | 46 // The provider is owned by the single CpuInfoProvider instance. |
40 CpuInfoProvider::InitializeForTesting(provider); | 47 CpuInfoProvider::InitializeForTesting(provider); |
41 ASSERT_TRUE(RunExtensionTest("system/cpu")) << message_; | 48 ASSERT_TRUE(RunExtensionTest("system/cpu")) << message_; |
42 } | 49 } |
43 | 50 |
44 } // namespace extensions | 51 } // namespace extensions |
OLD | NEW |