Reland "Revert 156830 - drive: Stop exposing operation_registry() from DriveServiceInterface"

chrome/browser/chromeos/gdata/drive_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/drive_protocol_handler.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 102 matching lines @@
 // Helper function to get DriveFileSystem from Profile on UI thread.
 void GetFileSystemOnUIThread(DriveFileSystemInterface** file_system) {
   DriveSystemService* system_service = GetSystemService();
   *file_system = system_service ? system_service->file_system() : NULL;
 }
 
 // Helper function to cancel Drive download operation on UI thread.
 void CancelDriveDownloadOnUIThread(const FilePath& drive_file_path) {
   DriveSystemService* system_service = GetSystemService();
   if (system_service)
-    system_service->drive_service()->operation_registry()->CancelForFilePath(
-        drive_file_path);
+    system_service->drive_service()->CancelForFilePath(drive_file_path);
 }
 
 // DriveURLRequesetJob is the gateway between network-level drive://...
 // requests for drive resources and DriveFileSytem.  It exposes content URLs
 // formatted as drive://<resource-id>.
 class DriveURLRequestJob : public net::URLRequestJob {
  public:
   DriveURLRequestJob(net::URLRequest* request,
                      net::NetworkDelegate* network_delegate);
 
@@ skipping 800 matching lines @@
 DriveProtocolHandler::~DriveProtocolHandler() {
 }
 
 net::URLRequestJob* DriveProtocolHandler::MaybeCreateJob(
     net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
   DVLOG(1) << "Handling url: " << request->url().spec();
   return new DriveURLRequestJob(request, network_delegate);
 }
 
 }  // namespace gdata