Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Side by Side Diff: chrome/browser/extensions/api/system_info_cpu/system_info_cpu_apitest.cc

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 SystemInfoCpuApiTest() {} 61 SystemInfoCpuApiTest() {}
62 virtual ~SystemInfoCpuApiTest() {} 62 virtual ~SystemInfoCpuApiTest() {}
63 63
64 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 64 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
65 ExtensionApiTest::SetUpCommandLine(command_line); 65 ExtensionApiTest::SetUpCommandLine(command_line);
66 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); 66 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
67 } 67 }
68 68
69 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 69 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
70 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); 70 ExtensionApiTest::SetUpInProcessBrowserTestFixture();
71 message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); 71 message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
72 } 72 }
73 73
74 private: 74 private:
75 scoped_ptr<MessageLoop> message_loop_; 75 scoped_ptr<base::MessageLoop> message_loop_;
76 }; 76 };
77 77
78 IN_PROC_BROWSER_TEST_F(SystemInfoCpuApiTest, Cpu) { 78 IN_PROC_BROWSER_TEST_F(SystemInfoCpuApiTest, Cpu) {
79 CpuInfoProvider* provider = new MockCpuInfoProviderImpl(); 79 CpuInfoProvider* provider = new MockCpuInfoProviderImpl();
80 // The provider is owned by the single CpuInfoProvider instance. 80 // The provider is owned by the single CpuInfoProvider instance.
81 CpuInfoProvider::InitializeForTesting(provider); 81 CpuInfoProvider::InitializeForTesting(provider);
82 ASSERT_TRUE(RunExtensionTest("systeminfo/cpu")) << message_; 82 ASSERT_TRUE(RunExtensionTest("systeminfo/cpu")) << message_;
83 } 83 }
84 84
85 } // namespace extensions 85 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698