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 #include "base/command_line.h" | 4 #include "base/command_line.h" |
5 #include "base/message_loop.h" | 5 #include "base/message_loop.h" |
6 #include "chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.h" | 6 #include "chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "chrome/browser/extensions/extension_test_message_listener.h" | 8 #include "chrome/browser/extensions/extension_test_message_listener.h" |
9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
10 #include "chrome/test/base/ui_test_utils.h" | 10 #include "chrome/test/base/ui_test_utils.h" |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 } | 71 } |
72 | 72 |
73 private: | 73 private: |
74 scoped_ptr<MessageLoop> message_loop_; | 74 scoped_ptr<MessageLoop> message_loop_; |
75 }; | 75 }; |
76 | 76 |
77 IN_PROC_BROWSER_TEST_F(SystemInfoCpuApiTest, Cpu) { | 77 IN_PROC_BROWSER_TEST_F(SystemInfoCpuApiTest, Cpu) { |
78 CpuInfoProvider* provider = new MockCpuInfoProviderImpl(); | 78 CpuInfoProvider* provider = new MockCpuInfoProviderImpl(); |
79 // The provider is owned by the single CpuInfoProvider instance. | 79 // The provider is owned by the single CpuInfoProvider instance. |
80 CpuInfoProvider::InitializeForTesting(provider); | 80 CpuInfoProvider::InitializeForTesting(provider); |
81 ASSERT_TRUE(RunExtensionTest("systeminfo/cpu")) << message_; | 81 ASSERT_TRUE(RunPlatformAppTest("systeminfo/cpu")) << message_; |
82 } | 82 } |
83 | 83 |
84 } // namespace extensions | 84 } // namespace extensions |
OLD | NEW |