[SystemInfo API] Finish TODOs in SystemInfoProvider

chrome/browser/extensions/api/system_info_display/system_info_display_apitest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/system_info_display/system_info_display_api.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/api/system_info_display/display_info_provider.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 
 namespace utils = extension_function_test_utils;
 
 namespace extensions {
 
 using api::system_info_display::Bounds;
 using api::system_info_display::DisplayUnitInfo;
 
 class MockDisplayInfoProvider : public DisplayInfoProvider {
  public:
   MockDisplayInfoProvider() {}
 
-  virtual bool QueryInfo(DisplayInfo* info) OVERRIDE {
-    info->clear();
+  virtual bool QueryInfo() OVERRIDE {
+    info_.clear();
     for (int i = 0; i < 4; i++) {
       linked_ptr<DisplayUnitInfo> unit(new DisplayUnitInfo());
       unit->id = base::IntToString(i);
       unit->name = "DISPLAY NAME FOR " + unit->id;
       if (i == 1)
         unit->mirroring_source_id = "0";
       unit->is_primary = i == 0 ? true : false;
       unit->is_internal = i == 0 ? true : false;
       unit->is_enabled = true;
       unit->rotation = (90 * i) % 360;
       unit->dpi_x = 96.0;
       unit->dpi_y = 96.0;
       unit->bounds.left = 0;
       unit->bounds.top = 0;
       unit->bounds.width = 1280;
       unit->bounds.height = 720;
       if (i == 0) {
         unit->overscan.left = 20;
         unit->overscan.top = 40;
         unit->overscan.right = 60;
         unit->overscan.bottom = 80;
       }
       unit->work_area.left = 0;
       unit->work_area.top = 0;
       unit->work_area.width = 960;
       unit->work_area.height = 720;
-      info->push_back(unit);
+      info_.push_back(unit);
     }
     return true;
   }
 
   virtual void SetInfo(
       const std::string& display_id,
       const api::system_info_display::DisplayProperties& params,
       const SetInfoCallback& callback) OVERRIDE {
     // Should get called only once per test case.
     EXPECT_FALSE(set_info_value_);
@@ skipping 141 matching lines @@
   EXPECT_EQ(1, utils::GetInteger(overscan, "left"));
   EXPECT_EQ(2, utils::GetInteger(overscan, "top"));
   EXPECT_EQ(3, utils::GetInteger(overscan, "right"));
   EXPECT_EQ(4, utils::GetInteger(overscan, "bottom"));
 
   EXPECT_EQ("display_id", provider_->GetSetInfoDisplayId());
 }
 #endif  // defined(OS_CHROMEOS)
 
 } // namespace extensions