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

chrome/browser/extensions/api/system_storage/storage_info_provider.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_storage/storage_info_provider.h"
+#include "chrome/browser/extensions/api/system_storage/storage_info_provider.h"
 
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace extensions {
 
 using content::BrowserThread;
 using chrome::StorageMonitor;
-using api::experimental_system_info_storage::StorageUnitInfo;
-using api::experimental_system_info_storage::STORAGE_UNIT_TYPE_FIXED;
-using api::experimental_system_info_storage::STORAGE_UNIT_TYPE_REMOVABLE;
+using api::system_storage::StorageUnitInfo;
+using api::system_storage::STORAGE_UNIT_TYPE_FIXED;
+using api::system_storage::STORAGE_UNIT_TYPE_REMOVABLE;
 
 namespace systeminfo {
 
 const char kStorageTypeUnknown[] = "unknown";
 const char kStorageTypeFixed[] = "fixed";
 const char kStorageTypeRemovable[] = "removable";
 
 void BuildStorageUnitInfo(const chrome::StorageInfo& info,
                           StorageUnitInfo* unit) {
   unit->id = StorageInfoProvider::Get()->GetTransientIdForDeviceId(
                  info.device_id());
   unit->name = UTF16ToUTF8(info.name());
   // TODO(hmin): Might need to take MTP device into consideration.
   unit->type = chrome::StorageInfo::IsRemovableDevice(info.device_id()) ?
       STORAGE_UNIT_TYPE_REMOVABLE : STORAGE_UNIT_TYPE_FIXED;
   unit->capacity = static_cast<double>(info.total_size_in_bytes());
-  unit->available_capacity = 0;
 }
 
 }  // namespace systeminfo
 
 const int kDefaultPollingIntervalMs = 1000;
 const char kWatchingTokenName[] = "_storage_info_watching_token_";
 
 // Static member intialization.
 template<>
 base::LazyInstance<scoped_refptr<SystemInfoProvider<StorageUnitInfoList> > >
@@ skipping 22 matching lines @@
     const base::Closure& do_query_info_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Register the |do_query_info_callback| callback to StorageMonitor.
   // See the comments of StorageMonitor::EnsureInitialized about when the
   // callback gets run.
   StorageMonitor::GetInstance()->EnsureInitialized(do_query_info_callback);
 }
 
 bool StorageInfoProvider::QueryInfo() {
   DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
-  for (StorageUnitInfoList::iterator it = info_.begin();
-       it != info_.end(); ++it) {
-    int64 amount = GetStorageFreeSpaceFromTransientId((*it)->id);
-    if (amount > 0)
-      (*it)->available_capacity = static_cast<double>(amount);
-  }
-
+  // No task to do in worker pool.
   return true;
 }
 
 std::vector<chrome::StorageInfo> StorageInfoProvider::GetAllStorages() const {
   return StorageMonitor::GetInstance()->GetAllAvailableStorages();
 }
 
 void StorageInfoProvider::GetAllStoragesIntoInfoList() {
   info_.clear();
   std::vector<chrome::StorageInfo> storage_list = GetAllStorages();
@@ skipping 171 matching lines @@
     const std::string& transient_id) const {
   return StorageMonitor::GetInstance()->GetDeviceIdForTransientId(transient_id);
 }
 
 // static
 StorageInfoProvider* StorageInfoProvider::Get() {
   return StorageInfoProvider::GetInstance<StorageInfoProvider>();
 }
 
 }  // namespace extensions