| Index: chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc b/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc
|
| index 1448727e162759e82a0165586616af82106b44fc..c9799bdec9f313933f880bfdb70588c066abbadc 100644
|
| --- a/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc
|
| +++ b/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc
|
| @@ -34,7 +34,14 @@ class SystemCpuApiTest: public ExtensionApiTest {
|
| }
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(SystemCpuApiTest, Cpu) {
|
| +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
|
| +// TODO(erg): linux_aura bringup: http://crbug.com/163931
|
| +#define MAYBE_Cpu DISABLED_Cpu
|
| +#else
|
| +#define MAYBE_Cpu Cpu
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(SystemCpuApiTest, MAYBE_Cpu) {
|
| CpuInfoProvider* provider = new MockCpuInfoProviderImpl();
|
| // The provider is owned by the single CpuInfoProvider instance.
|
| CpuInfoProvider::InitializeForTesting(provider);
|
|
|