[SystemInfo API] Move Storage API out of experimental namespace and rename to the "system" namespace

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/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.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/browser/storage_monitor/removable_storage_observer.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/common/extensions/api/experimental_system_info_storage.h"
+#include "chrome/common/extensions/api/system_info_storage.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::experimental_system_info_storage::StorageFreeSpaceChangeInfo;
-using api::experimental_system_info_storage::StorageUnitInfo;
-using api::experimental_system_info_storage::StorageUnitType;
+using api::system_info_storage::StorageUnitInfo;
+using api::system_info_storage::StorageUnitType;
 using content::BrowserThread;
 
 namespace {
 
 // The display events use the "systemInfo" prefix.
 const char kSystemInfoEventPrefix[] = "systemInfo";
 // The storage events still use the "experimental.systemInfo" prefix.
 const char kExperimentalSystemInfoEventPrefix[] = "experimental.systemInfo";
 
 bool IsDisplayChangedEvent(const std::string& event_name) {
@@ skipping 32 matching lines @@
   virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE;
   virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
   virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
 
   // chrome::RemovableStorageObserver implementation.
   virtual void OnRemovableStorageAttached(
       const chrome::StorageInfo& info) OVERRIDE;
   virtual void OnRemovableStorageDetached(
       const chrome::StorageInfo& info) OVERRIDE;
 
-  void DispatchStorageAttachedEvent(const chrome::StorageInfo& info,
-                                    int64 avail_bytes);
+  void DispatchStorageAttachedEvent(const chrome::StorageInfo& info);
 
   // 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);
@@ skipping 116 matching lines @@
   info.available_capacity = static_cast<double>(new_value);
 
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->Append(info.ToValue().release());
 
   DispatchEvent(event_names::kOnStorageAvailableCapacityChanged, args.Pass());
 }
 
 void SystemInfoEventRouter::OnRemovableStorageAttached(
     const chrome::StorageInfo& info) {
-  base::PostTaskAndReplyWithResult(
-      BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(
-          base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN),
-      FROM_HERE,
-      base::Bind(&StorageInfoProvider::GetStorageFreeSpaceFromTransientId,
-                 StorageInfoProvider::Get(),
-                 StorageInfoProvider::Get()->GetTransientIdForDeviceId(
-                     info.device_id())),
-      base::Bind(&SystemInfoEventRouter::DispatchStorageAttachedEvent,
-                 // Since SystemInfoEventRouter is a global lazy instance, this
-                 // pointer will be alive when the reply comes back.
-                 base::Unretained(this),
-                 info));
+  DispatchStorageAttachedEvent(info);
 }
 
 void SystemInfoEventRouter::DispatchStorageAttachedEvent(
-    const chrome::StorageInfo& info, int64 avail_bytes) {
+    const chrome::StorageInfo& info) {
   StorageUnitInfo unit;
   systeminfo::BuildStorageUnitInfo(info, &unit);
 
-  unit.available_capacity =
-      avail_bytes > 0 ? static_cast<double>(avail_bytes) : 0;
-
   scoped_ptr<base::ListValue> args(new base::ListValue);
   args->Append(unit.ToValue().release());
   DispatchEvent(event_names::kOnStorageAttached, args.Pass());
 }
 
 void SystemInfoEventRouter::OnRemovableStorageDetached(
     const chrome::StorageInfo& info) {
   scoped_ptr<base::ListValue> args(new base::ListValue);
   args->Append(new base::StringValue(StorageInfoProvider::Get()->
                    GetTransientIdForDeviceId(info.device_id())));
@@ skipping 53 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