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

chrome/browser/google_apis/operations_base.h

 // 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_OPERATIONS_BASE_H_
 #define CHROME_BROWSER_GOOGLE_APIS_OPERATIONS_BASE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 83 matching lines @@
   // Overridden from AuthenticatedOperationInterface.
   virtual void Start(const std::string& auth_token) OVERRIDE;
 
   // Overridden from AuthenticatedOperationInterface.
   virtual void SetReAuthenticateCallback(
       const ReAuthenticateCallback& callback) OVERRIDE;
 
  protected:
   explicit UrlFetchOperationBase(OperationRegistry* registry);
   UrlFetchOperationBase(OperationRegistry* registry,
-                        OperationRegistry::OperationType type,
+                        OperationType type,
                         const FilePath& path);
   virtual ~UrlFetchOperationBase();
 
   // Gets URL for the request.
   virtual GURL GetURL() const = 0;
   // Returns the request type. A derived class should override this method
   // for a request type other than HTTP GET.
   virtual net::URLFetcher::RequestType GetRequestType() const;
   // Returns the extra HTTP headers for the request. A derived class should
   // override this method to specify any extra headers needed for the request.
@@ skipping 110 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<GetDataOperation> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(GetDataOperation);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_OPERATIONS_BASE_H_