Remove chromeos::GDataFileSystem::GetOperationRegistry()

chrome/browser/chromeos/gdata/gdata_protocol_handler.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/gdata/gdata_protocol_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 #include "chrome/browser/chromeos/gdata/gdata_files.h"
+#include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/escape.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_request_headers.h"
@@ skipping 46 matching lines @@
     return false;
   }
 
   std::string id = path.substr(drive_schema.size());
   *resource_id = net::UnescapeURLComponent(id, kUrlPathUnescapeMask);
   return resource_id->size();
 }
 
 }  // namespace
 
+// Helper function to get GDataSystemService from Profile.

[achuithb, 2012/06/07 09:55:39]

Any reason why this is not in the anonymous namespace?

[hashimoto, 2012/06/07 10:11:57]

Oops, done

[achuithb, 2012/06/07 10:24:43]

Is it possible to also move all the other functions (GetFileSystemOnUIThread,
CancelGDataDownloadOnUIThread) as well as GDataURLRequestJob class definition
and method definitions to anon namespace too? Should be a small change of moving
the end namespace marker.

[hashimoto, 2012/06/07 16:16:21]

Done.

+GDataSystemService* GetSystemService() {
+  return GDataSystemServiceFactory::GetForProfile(
+      ProfileManager::GetDefaultProfile());
+}
+
 // Helper function to get GDataFileSystem from Profile on UI thread.
 void GetFileSystemOnUIThread(GDataFileSystem** file_system) {
-  GDataSystemService* system_service = GDataSystemServiceFactory::GetForProfile(
-      ProfileManager::GetDefaultProfile());
+  GDataSystemService* system_service = GetSystemService();
   *file_system = system_service ? system_service->file_system() : NULL;
 }
 
 // Helper function to cancel GData download operation on UI thread.
 void CancelGDataDownloadOnUIThread(const FilePath& gdata_file_path) {
-  GDataFileSystem* file_system = NULL;
-  GetFileSystemOnUIThread(&file_system);
-  if (file_system)
-    file_system->GetOperationRegistry()->CancelForFilePath(gdata_file_path);
+  GDataSystemService* system_service = GetSystemService();
+  if (system_service)
+    system_service->docs_service()->operation_registry()->CancelForFilePath(
+        gdata_file_path);
 }
 
 // GDataURLRequesetJob is the gateway between network-level drive://...
 // requests for gdata resources and GDataFileSytem.  It exposes content URLs
 // formatted as drive://<resource-id>.
 class GDataURLRequestJob : public net::URLRequestJob {
  public:
   explicit GDataURLRequestJob(net::URLRequest* request);
   virtual ~GDataURLRequestJob();
 
@@ skipping 789 matching lines @@
 GDataProtocolHandler::~GDataProtocolHandler() {
 }
 
 net::URLRequestJob* GDataProtocolHandler::MaybeCreateJob(
     net::URLRequest* request) const {
   DVLOG(1) << "Handling url: " << request->url().spec();
   return new GDataURLRequestJob(request);
 }
 
 }  // namespace gdata