| Index: chrome/browser/chromeos/gdata/gdata_wapi_service.h
|
| diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_service.h b/chrome/browser/chromeos/gdata/gdata_wapi_service.h
|
| index 04d7ecc86e99d5a17ff3d6580b72874bfba50f64..506a93b213b4c028e01ae54411d1928c4f6e6eb1 100644
|
| --- a/chrome/browser/chromeos/gdata/gdata_wapi_service.h
|
| +++ b/chrome/browser/chromeos/gdata/gdata_wapi_service.h
|
| @@ -9,9 +9,9 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "chrome/browser/chromeos/gdata/auth_service.h"
|
| #include "chrome/browser/chromeos/gdata/drive_service_interface.h"
|
| #include "chrome/browser/chromeos/gdata/gdata_operations.h"
|
| -#include "chrome/browser/chromeos/gdata/gdata_auth_service.h"
|
| #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
|
|
|
| class FilePath;
|
| @@ -20,7 +20,7 @@ class Profile;
|
|
|
| namespace gdata {
|
|
|
| -class GDataOperationRunner;
|
| +class OperationRunner;
|
|
|
| // This class provides documents feed service calls for WAPI (codename for
|
| // DocumentsList API).
|
| @@ -33,11 +33,11 @@ class GDataWapiService : public DriveServiceInterface {
|
| GDataWapiService();
|
| virtual ~GDataWapiService();
|
|
|
| - GDataAuthService* auth_service_for_testing();
|
| + AuthService* auth_service_for_testing();
|
|
|
| // DriveServiceInterface Overrides
|
| virtual void Initialize(Profile* profile) OVERRIDE;
|
| - virtual GDataOperationRegistry* operation_registry() const OVERRIDE;
|
| + virtual OperationRegistry* operation_registry() const OVERRIDE;
|
| virtual void CancelAll() OVERRIDE;
|
| virtual void Authenticate(const AuthStatusCallback& callback) OVERRIDE;
|
| virtual bool HasAccessToken() const OVERRIDE;
|
| @@ -95,7 +95,7 @@ class GDataWapiService : public DriveServiceInterface {
|
| private:
|
| Profile* profile_;
|
|
|
| - scoped_ptr<GDataOperationRunner> runner_;
|
| + scoped_ptr<OperationRunner> runner_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GDataWapiService);
|
| };
|
|
|