chrome/browser/extensions/api/system_info_cpu/system_info_cpu_apitest.cc - Issue 11299326: Revert 170660

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11299326: Revert 170660 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years 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

« no previous file with comments | « chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc ('k') | chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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(RunPlatformAppTest("systeminfo/cpu")) << message_;	81 ASSERT_TRUE(RunExtensionTest("systeminfo/cpu")) << message_;

82 }	82 }

83	83

84 } // namespace extensions	84 } // namespace extensions

OLD	NEW