[SystemInfo API] Finish TODOs in SystemInfoProvider

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

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..960eccae4fc7c97c16c876a67ef9e07954be540c 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,8 @@ const struct TestCpuInfo kTestingCpuInfoData = {
 class TestCpuInfoProvider : public CpuInfoProvider {
  public:
   TestCpuInfoProvider();
-  virtual bool QueryInfo(CpuInfo* info) OVERRIDE;
+  virtual void QueryInfo() OVERRIDE;
+  const CpuInfo* cpu_info() const;
 
  private:
   virtual ~TestCpuInfoProvider();
@@ -38,13 +39,17 @@ TestCpuInfoProvider::TestCpuInfoProvider() {}
 
 TestCpuInfoProvider::~TestCpuInfoProvider() {}
 
-bool TestCpuInfoProvider::QueryInfo(CpuInfo* info) {
-  if (info == NULL)
-    return false;
+void TestCpuInfoProvider::QueryInfo() {
+  CpuInfo* info = &info_;
+
   info->arch_name = kTestingCpuInfoData.arch_name;
   info->model_name = kTestingCpuInfoData.model_name;
   info->num_of_processors = kTestingCpuInfoData.num_of_processors;
-  return true;
+  success_ = true;
+}
+
+const CpuInfo* TestCpuInfoProvider::cpu_info() const {
+  return &info_;
 }
 
 class CpuInfoProviderTest : public testing::Test {
@@ -59,11 +64,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);
+  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);
 }
 
 }