[SystemInfo API] Finish TODOs in SystemInfoProvider

chrome/browser/extensions/api/system_info/system_info_api.cc

 // Copyright 2013 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/system_info_api.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 77 matching lines @@
   void DispatchStorageAttachedEvent(const chrome::StorageInfo& info,
                                     int64 avail_bytes);
 
   // Called from any thread to dispatch the systemInfo event to all extension
   // processes cross multiple profiles.
   void DispatchEvent(const std::string& event_name,
       scoped_ptr<base::ListValue> args);
 
   // The callbacks of querying storage info to start and stop watching the
   // storages. Called from UI thread.
-  void StartWatchingStorages(const StorageInfo& info, bool success);
-  void StopWatchingStorages(const StorageInfo& info, bool success);
+  void StartWatchingStorages(bool success);
+  void StopWatchingStorages(bool success);
 
   // Called to dispatch the systemInfo.display.onDisplayChanged event.
   void OnDisplayChanged();
 
   // Used to record the event names being watched.
   std::multiset<std::string> watching_event_set_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemInfoEventRouter);
 };
 
 static base::LazyInstance<SystemInfoEventRouter>::Leaky
   g_system_info_event_router = LAZY_INSTANCE_INITIALIZER;
 
 // static
 SystemInfoEventRouter* SystemInfoEventRouter::GetInstance() {
   return g_system_info_event_router.Pointer();
 }
 
 SystemInfoEventRouter::SystemInfoEventRouter() {
   StorageInfoProvider::Get()->AddObserver(this);
   chrome::StorageMonitor::GetInstance()->AddObserver(this);
 }
 
 SystemInfoEventRouter::~SystemInfoEventRouter() {
   StorageInfoProvider::Get()->RemoveObserver(this);
   if (chrome::StorageMonitor::GetInstance())
     chrome::StorageMonitor::GetInstance()->RemoveObserver(this);
 }
 
-void SystemInfoEventRouter::StartWatchingStorages(
-    const StorageInfo& info, bool success) {
+void SystemInfoEventRouter::StartWatchingStorages(bool success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!success)
     return;
 
-  for (StorageInfo::const_iterator it = info.begin(); it != info.end(); ++it) {
+  const StorageInfo* info = StorageInfoProvider::Get()->storage_info();
+  for (StorageInfo::const_iterator it = info->begin();
+       it != info->end(); ++it) {
     StorageInfoProvider::Get()->StartWatching((*it)->id);
   }
 }
 
-void SystemInfoEventRouter::StopWatchingStorages(
-    const StorageInfo& info, bool success) {
+void SystemInfoEventRouter::StopWatchingStorages(bool success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!success)
     return;
 
-  for (StorageInfo::const_iterator it = info.begin(); it != info.end(); ++it) {
+  const StorageInfo* info = StorageInfoProvider::Get()->storage_info();
+  for (StorageInfo::const_iterator it = info->begin();
+       it != info->end(); ++it) {
     StorageInfoProvider::Get()->StopWatching((*it)->id);
   }
 }
 
 void SystemInfoEventRouter::AddEventListener(const std::string& event_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   watching_event_set_.insert(event_name);
   if (watching_event_set_.count(event_name) > 1)
     return;
@@ skipping 151 matching lines @@
 
 void SystemInfoAPI::OnListenerAdded(const EventListenerInfo& details) {
   SystemInfoEventRouter::GetInstance()->AddEventListener(details.event_name);
 }
 
 void SystemInfoAPI::OnListenerRemoved(const EventListenerInfo& details) {
   SystemInfoEventRouter::GetInstance()->RemoveEventListener(details.event_name);
 }
 
 }  // namespace extensions