gdata: Get rid of GetProgressStatusList() and friends

chrome/browser/chromeos/extensions/file_browser_private_api.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/chromeos/extensions/file_browser_private_api.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 1807 matching lines @@
 
 GetFileTransfersFunction::~GetFileTransfersFunction() {}
 
 ListValue* GetFileTransfersFunction::GetFileTransfersList() {
   gdata::GDataSystemService* system_service =
       gdata::GDataSystemServiceFactory::GetForProfile(profile_);
   if (!system_service)
     return NULL;
 
   std::vector<gdata::GDataOperationRegistry::ProgressStatus>
-      list = system_service->file_system()->GetProgressStatusList();
+      list = system_service->file_system()->GetOperationRegistry()->
+      GetProgressStatusList();
   return file_manager_util::ProgressStatusVectorToListValue(
       profile_, source_url_.GetOrigin(), list);
 }
 
 bool GetFileTransfersFunction::RunImpl() {
   scoped_ptr<ListValue> progress_status_list(GetFileTransfersList());
   if (!progress_status_list.get()) {
     SendResponse(false);
     return false;
   }
@@ skipping 34 matching lines @@
 void CancelFileTransfersFunction::GetLocalPathsResponseOnUIThread(
     const SelectedFileInfoList& files) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   gdata::GDataSystemService* system_service =
       gdata::GDataSystemServiceFactory::GetForProfile(profile_);
   if (!system_service) {
     SendResponse(false);
     return;
   }
 
+  gdata::GDataOperationRegistry* operation_registry =

[achuithb, 2012/04/24 00:16:22]

can any of these be NULL?

[satorux1, 2012/04/24 06:15:25]

no. as long as system_service is non-null, the file system and the operation
should be non-null. 

+      system_service->file_system()->GetOperationRegistry();
+
   scoped_ptr<ListValue> responses(new ListValue());
   for (size_t i = 0; i < files.size(); ++i) {
     DCHECK(gdata::util::IsUnderGDataMountPoint(files[i].path));
     FilePath file_path = gdata::util::ExtractGDataPath(files[i].path);
     scoped_ptr<DictionaryValue> result(new DictionaryValue());
     result->SetBoolean(
         "canceled",
-        system_service->file_system()->CancelOperation(file_path));
+        operation_registry->CancelForFilePath(file_path));
     GURL file_url;
     if (file_manager_util::ConvertFileToFileSystemUrl(profile_,
             gdata::util::GetSpecialRemoteRootPath().Append(file_path),
             source_url_.GetOrigin(),
             &file_url)) {
       result->SetString("fileUrl", file_url.spec());
     }
 
     responses->Append(result.release());
   }
@@ skipping 97 matching lines @@
   if (value->GetBoolean("cellularDisabled", &tmp)) {
     service->SetBoolean(prefs::kDisableGDataOverCellular, tmp);
   }
 
   if (value->GetBoolean("hostedFilesDisabled", &tmp)) {
     service->SetBoolean(prefs::kDisableGDataHostedFiles, tmp);
   }
 
   return true;
 }