chrome/browser/extensions/api/system_info_cpu/cpu_info_provider_unittest.cc - Issue 18290002: [SystemInfo API] Finish TODOs in SystemInfoProvider

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

Unified Diff: chrome/browser/extensions/api/system_info_cpu/cpu_info_provider_unittest.cc

Issue 18290002: [SystemInfo API] Finish TODOs in SystemInfoProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dev_rewrite_storage_info_api

Patch Set: Pass chromeos unit_tests Created 7 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.cc ('k') | chrome/browser/extensions/api/system_info_cpu/system_info_cpu_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/system_info_cpu/cpu_info_provider_unittest.cc

diff --git a/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider_unittest.cc b/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider_unittest.cc

index 8b8d630ddfec1691d566a8979b2d9ee995190a8d..05ac22f8944e244d51626a8c06da8be1e75921ad 100644

--- a/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider_unittest.cc

+++ b/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider_unittest.cc

@@ -28,7 +28,7 @@ const struct TestCpuInfo kTestingCpuInfoData = {

class TestCpuInfoProvider : public CpuInfoProvider {

public:

TestCpuInfoProvider();

- virtual bool QueryInfo(CpuInfo* info) OVERRIDE;

+ virtual bool QueryInfo() OVERRIDE;

private:

virtual ~TestCpuInfoProvider();

@@ -38,12 +38,10 @@ TestCpuInfoProvider::TestCpuInfoProvider() {}

TestCpuInfoProvider::~TestCpuInfoProvider() {}

-bool TestCpuInfoProvider::QueryInfo(CpuInfo* info) {

- if (info == NULL)

- return false;

- info->arch_name = kTestingCpuInfoData.arch_name;

- info->model_name = kTestingCpuInfoData.model_name;

- info->num_of_processors = kTestingCpuInfoData.num_of_processors;

+bool TestCpuInfoProvider::QueryInfo() {

+ info_.arch_name = kTestingCpuInfoData.arch_name;

+ info_.model_name = kTestingCpuInfoData.model_name;

+ info_.num_of_processors = kTestingCpuInfoData.num_of_processors;

return true;

}

@@ -59,11 +57,13 @@ CpuInfoProviderTest::CpuInfoProviderTest() {}

TEST_F(CpuInfoProviderTest, QueryCpuInfo) {

cpu_info_provider_ = new TestCpuInfoProvider();

- scoped_ptr<CpuInfo> cpu_info(new CpuInfo());

- EXPECT_TRUE(cpu_info_provider_->QueryInfo(cpu_info.get()));

- EXPECT_EQ(kTestingCpuInfoData.arch_name, cpu_info->arch_name);

- EXPECT_EQ(kTestingCpuInfoData.model_name, cpu_info->model_name);

- EXPECT_EQ(kTestingCpuInfoData.num_of_processors, cpu_info->num_of_processors);

+ EXPECT_TRUE(cpu_info_provider_->QueryInfo());

+ EXPECT_EQ(kTestingCpuInfoData.arch_name,

+ cpu_info_provider_->cpu_info().arch_name);

+ EXPECT_EQ(kTestingCpuInfoData.model_name,

+ cpu_info_provider_->cpu_info().model_name);

+ EXPECT_EQ(kTestingCpuInfoData.num_of_processors,

+ cpu_info_provider_->cpu_info().num_of_processors);

}