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

chrome/browser/google_apis/gdata_operations.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/google_apis/gdata_operations.h"
 
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/google_apis/gdata_util.h"
@@ skipping 276 matching lines @@
 //============================ DownloadFileOperation ===========================
 
 DownloadFileOperation::DownloadFileOperation(
     OperationRegistry* registry,
     const DownloadActionCallback& download_action_callback,
     const GetContentCallback& get_content_callback,
     const GURL& document_url,
     const FilePath& virtual_path,
     const FilePath& output_file_path)
     : UrlFetchOperationBase(registry,
-                            OperationRegistry::OPERATION_DOWNLOAD,
+                            OPERATION_DOWNLOAD,
                             virtual_path),
       download_action_callback_(download_action_callback),
       get_content_callback_(get_content_callback),
       document_url_(document_url) {
   // Make sure we download the content into a temp file.
   if (output_file_path.empty())
     save_temp_file_ = true;
   else
     output_file_path_ = output_file_path;
 }
@@ skipping 375 matching lines @@
   return headers;
 }
 
 //=========================== InitiateUploadOperation ==========================
 
 InitiateUploadOperation::InitiateUploadOperation(
     OperationRegistry* registry,
     const InitiateUploadCallback& callback,
     const InitiateUploadParams& params)
     : UrlFetchOperationBase(registry,
-                            OperationRegistry::OPERATION_UPLOAD,
+                            OPERATION_UPLOAD,
                             params.virtual_path),
       callback_(callback),
       params_(params),
       initiate_upload_url_(chrome_common_net::AppendOrReplaceQueryParameter(
           params.upload_location,
           kUploadParamConvertKey,
           kUploadParamConvertValue)) {
 }
 
 InitiateUploadOperation::~InitiateUploadOperation() {}
@@ skipping 84 matching lines @@
   return true;
 }
 
 //============================ ResumeUploadOperation ===========================
 
 ResumeUploadOperation::ResumeUploadOperation(
     OperationRegistry* registry,
     const ResumeUploadCallback& callback,
     const ResumeUploadParams& params)
   : UrlFetchOperationBase(registry,
-                          OperationRegistry::OPERATION_UPLOAD,
+                          OPERATION_UPLOAD,
                           params.virtual_path),
       callback_(callback),
       params_(params),
       last_chunk_completed_(false) {
 }
 
 ResumeUploadOperation::~ResumeUploadOperation() {}
 
 GURL ResumeUploadOperation::GetURL() const {
   return params_.upload_location;
@@ skipping 63 matching lines @@
   OnProcessURLFetchResultsComplete(
       last_chunk_completed_ || code == HTTP_RESUME_INCOMPLETE);
 }
 
 void ResumeUploadOperation::NotifyStartToOperationRegistry() {
   NotifyResume();
 }
 
 void ResumeUploadOperation::NotifySuccessToOperationRegistry() {
   if (last_chunk_completed_)
-    NotifyFinish(OperationRegistry::OPERATION_COMPLETED);
+    NotifyFinish(OPERATION_COMPLETED);
   else
     NotifySuspend();
 }
 
 void ResumeUploadOperation::RunCallbackOnPrematureFailure(GDataErrorCode code) {
   scoped_ptr<DocumentEntry> entry;
   if (!callback_.is_null())
     callback_.Run(ResumeUploadResponse(code, 0, 0), entry.Pass());
 }
 
@@ skipping 115 matching lines @@
   OnProcessURLFetchResultsComplete(code == HTTP_SUCCESS);
 }
 
 void GetContactPhotoOperation::RunCallbackOnPrematureFailure(
     GDataErrorCode code) {
   scoped_ptr<std::string> data(new std::string);
   callback_.Run(code, data.Pass());
 }
 
 }  // namespace gdata