Remove onUpdate from systemInfo.cpu API

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"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.h"
 #include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #include "chrome/common/extensions/api/experimental_system_info_storage.h"
-#include "chrome/common/extensions/api/system_info_cpu.h"
 #include "ui/gfx/display_observer.h"
 
 #if defined(USE_ASH)
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #endif
 
 namespace extensions {
 
-using api::system_info_cpu::CpuUpdateInfo;
 using api::experimental_system_info_storage::StorageUnitInfo;
 using api::experimental_system_info_storage::StorageUnitType;
 using api::experimental_system_info_storage::StorageChangeInfo;
 using content::BrowserThread;
 
 namespace {
 
 // The display events use the "systemInfo" prefix.
 const char kSystemInfoEventPrefix[] = "systemInfo";
-// The storage and cpu events still use the "experimental.systemInfo" prefix.
+// The storage events still use the "experimental.systemInfo" prefix.
 const char kExperimentalSystemInfoEventPrefix[] = "experimental.systemInfo";
 
 bool IsDisplayChangedEvent(const std::string& event_name) {
   return event_name == event_names::kOnDisplayChanged;
 }
 
 bool IsAvailableCapacityChangedEvent(const std::string& event_name) {
   return event_name == event_names::kOnStorageAvailableCapacityChanged;
 }
 
-bool IsCpuUpdatedEvent(const std::string& event_name) {
-  return event_name == event_names::kOnCpuUpdated;
-}
-
 // Event router for systemInfo API. It is a singleton instance shared by
 // multiple profiles.
 class SystemInfoEventRouter
     : public gfx::DisplayObserver, public StorageInfoObserver {
  public:
   static SystemInfoEventRouter* GetInstance();
 
   SystemInfoEventRouter();
   virtual ~SystemInfoEventRouter();
 
@@ skipping 24 matching lines @@
   // 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);
 
-  // The callback for CPU sampling cycle. Called from FILE thread.
-  void OnNextCpuSampling(
-      scoped_ptr<api::system_info_cpu::CpuUpdateInfo> info);
-
   // 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
@@ skipping 43 matching lines @@
 
   // Start watching the |event_name| event if the first event listener arrives.
   // For systemInfo.storage event.
   if (IsAvailableCapacityChangedEvent(event_name)) {
     StorageInfoProvider::Get()->StartQueryInfo(
         base::Bind(&SystemInfoEventRouter::StartWatchingStorages,
                    base::Unretained(this)));
     return;
   }
 
-  // For systemInfo.cpu event.
-  if (IsCpuUpdatedEvent(event_name)) {
-    CpuInfoProvider::Get()->StartSampling(
-        base::Bind(&SystemInfoEventRouter::OnNextCpuSampling,
-                   base::Unretained(this)));
-    return;
-  }
-
   // For systemInfo.display event.
   if (IsDisplayChangedEvent(event_name)) {
 #if defined(USE_ASH)
     ash::Shell::GetScreen()->AddObserver(this);
 #endif
   }
 }
 
 void SystemInfoEventRouter::RemoveEventListener(
     const std::string& event_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   std::multiset<std::string>::iterator it =
       watching_event_set_.find(event_name);
   if (it != watching_event_set_.end())
     watching_event_set_.erase(it);
 
   if (watching_event_set_.count(event_name) > 0)
     return;
 
   // In case of the last event listener is removed, we need to stop watching
   // it to avoid unnecessary overhead.
   if (IsAvailableCapacityChangedEvent(event_name)) {
     StorageInfoProvider::Get()->StartQueryInfo(
         base::Bind(&SystemInfoEventRouter::StopWatchingStorages,
                    base::Unretained(this)));
   }
 
-  if (IsCpuUpdatedEvent(event_name)) {
-    CpuInfoProvider::Get()->StopSampling();
-  }
-
   if (IsDisplayChangedEvent(event_name)) {
 #if defined(USE_ASH)
     ash::Shell::GetScreen()->RemoveObserver(this);
 #endif
   }
 }
 
 // static
 bool SystemInfoEventRouter::IsSystemInfoEvent(const std::string& event_name) {
   // TODO(hshi): simplify this once all systemInfo APIs are out of experimental.
@@ skipping 55 matching lines @@
   scoped_ptr<base::ListValue> args(new base::ListValue());
   DispatchEvent(event_names::kOnDisplayChanged, args.Pass());
 }
 
 void SystemInfoEventRouter::DispatchEvent(const std::string& event_name,
                                           scoped_ptr<base::ListValue> args) {
   g_browser_process->extension_event_router_forwarder()->
       BroadcastEventToRenderers(event_name, args.Pass(), GURL());
 }
 
-void SystemInfoEventRouter::OnNextCpuSampling(scoped_ptr<CpuUpdateInfo> info) {
-  scoped_ptr<base::ListValue> args(new base::ListValue());
-  args->Append(info->ToValue().release());
-
-  DispatchEvent(event_names::kOnCpuUpdated, args.Pass());
-}
-
 }  // namespace
 
 static base::LazyInstance<ProfileKeyedAPIFactory<SystemInfoAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 ProfileKeyedAPIFactory<SystemInfoAPI>* SystemInfoAPI::GetFactoryInstance() {
   return &g_factory.Get();
 }
 
 SystemInfoAPI::SystemInfoAPI(Profile* profile) : profile_(profile) {
   ExtensionSystem::Get(profile_)->event_router()->RegisterObserver(
-      this, event_names::kOnCpuUpdated);
-  ExtensionSystem::Get(profile_)->event_router()->RegisterObserver(
       this, event_names::kOnStorageAvailableCapacityChanged);
   ExtensionSystem::Get(profile_)->event_router()->RegisterObserver(
       this, event_names::kOnStorageAttached);
   ExtensionSystem::Get(profile_)->event_router()->RegisterObserver(
       this, event_names::kOnStorageDetached);
 }
 
 SystemInfoAPI::~SystemInfoAPI() {
 }
 
 void SystemInfoAPI::Shutdown() {
   ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this);
 }
 
 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