| Index: chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h
 | 
| diff --git a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h
 | 
| index b4a547b4bafb749b84fb3d61cab8ec9a27a80b6e..e542fd7b07ab837d463828695fb420900198bcab 100644
 | 
| --- a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h
 | 
| +++ b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h
 | 
| @@ -36,111 +36,111 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
 | 
|        const std::string& parent_resource_id,
 | 
|        const std::string& directory_title,
 | 
|        const AddNewDirectoryOptions& options,
 | 
| -      const google_apis::FileResourceCallback& callback) OVERRIDE;
 | 
| +      const google_apis::FileResourceCallback& callback) override;
 | 
|  
 | 
|    virtual google_apis::CancelCallback DeleteResource(
 | 
|        const std::string& resource_id,
 | 
|        const std::string& etag,
 | 
| -      const google_apis::EntryActionCallback& callback) OVERRIDE;
 | 
| +      const google_apis::EntryActionCallback& callback) override;
 | 
|  
 | 
|    virtual google_apis::CancelCallback DownloadFile(
 | 
|        const base::FilePath& local_cache_path,
 | 
|        const std::string& resource_id,
 | 
|        const google_apis::DownloadActionCallback& download_action_callback,
 | 
|        const google_apis::GetContentCallback& get_content_callback,
 | 
| -      const google_apis::ProgressCallback& progress_callback) OVERRIDE;
 | 
| +      const google_apis::ProgressCallback& progress_callback) override;
 | 
|  
 | 
|    virtual google_apis::CancelCallback GetAboutResource(
 | 
| -      const google_apis::AboutResourceCallback& callback) OVERRIDE;
 | 
| +      const google_apis::AboutResourceCallback& callback) override;
 | 
|  
 | 
|    virtual google_apis::CancelCallback GetChangeList(
 | 
|        int64 start_changestamp,
 | 
| -      const google_apis::ChangeListCallback& callback) OVERRIDE;
 | 
| +      const google_apis::ChangeListCallback& callback) override;
 | 
|  
 | 
|    virtual google_apis::CancelCallback GetRemainingChangeList(
 | 
|        const GURL& next_link,
 | 
| -      const google_apis::ChangeListCallback& callback) OVERRIDE;
 | 
| +      const google_apis::ChangeListCallback& callback) override;
 | 
|  
 | 
| -  virtual std::string GetRootResourceId() const OVERRIDE;
 | 
| +  virtual std::string GetRootResourceId() const override;
 | 
|  
 | 
|    virtual google_apis::CancelCallback GetRemainingFileList(
 | 
|        const GURL& next_link,
 | 
| -      const google_apis::FileListCallback& callback) OVERRIDE;
 | 
| +      const google_apis::FileListCallback& callback) override;
 | 
|  
 | 
|    virtual google_apis::CancelCallback GetFileResource(
 | 
|        const std::string& resource_id,
 | 
| -      const google_apis::FileResourceCallback& callback) OVERRIDE;
 | 
| +      const google_apis::FileResourceCallback& callback) override;
 | 
|  
 | 
|    virtual google_apis::CancelCallback GetFileListInDirectory(
 | 
|        const std::string& directory_resource_id,
 | 
| -      const google_apis::FileListCallback& callback) OVERRIDE;
 | 
| +      const google_apis::FileListCallback& callback) override;
 | 
|  
 | 
|    virtual google_apis::CancelCallback RemoveResourceFromDirectory(
 | 
|        const std::string& parent_resource_id,
 | 
|        const std::string& resource_id,
 | 
| -      const google_apis::EntryActionCallback& callback) OVERRIDE;
 | 
| +      const google_apis::EntryActionCallback& callback) override;
 | 
|  
 | 
|    virtual google_apis::CancelCallback SearchByTitle(
 | 
|        const std::string& title,
 | 
|        const std::string& directory_resource_id,
 | 
| -      const google_apis::FileListCallback& callback) OVERRIDE;
 | 
| +      const google_apis::FileListCallback& callback) override;
 | 
|  
 | 
| -  virtual bool HasRefreshToken() const OVERRIDE;
 | 
| +  virtual bool HasRefreshToken() const override;
 | 
|  
 | 
|    // Following virtual methods are expected not to be accessed at all.
 | 
| -  virtual void Initialize(const std::string& account_id) OVERRIDE;
 | 
| -  virtual void AddObserver(drive::DriveServiceObserver* observer) OVERRIDE;
 | 
| -  virtual void RemoveObserver(drive::DriveServiceObserver* observer) OVERRIDE;
 | 
| -  virtual bool CanSendRequest() const OVERRIDE;
 | 
| -  virtual bool HasAccessToken() const OVERRIDE;
 | 
| +  virtual void Initialize(const std::string& account_id) override;
 | 
| +  virtual void AddObserver(drive::DriveServiceObserver* observer) override;
 | 
| +  virtual void RemoveObserver(drive::DriveServiceObserver* observer) override;
 | 
| +  virtual bool CanSendRequest() const override;
 | 
| +  virtual bool HasAccessToken() const override;
 | 
|    virtual void RequestAccessToken(
 | 
| -      const google_apis::AuthStatusCallback& callback) OVERRIDE;
 | 
| -  virtual void ClearAccessToken() OVERRIDE;
 | 
| -  virtual void ClearRefreshToken() OVERRIDE;
 | 
| +      const google_apis::AuthStatusCallback& callback) override;
 | 
| +  virtual void ClearAccessToken() override;
 | 
| +  virtual void ClearRefreshToken() override;
 | 
|    virtual google_apis::CancelCallback GetAllFileList(
 | 
| -      const google_apis::FileListCallback& callback) OVERRIDE;
 | 
| +      const google_apis::FileListCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback Search(
 | 
|        const std::string& search_query,
 | 
| -      const google_apis::FileListCallback& callback) OVERRIDE;
 | 
| +      const google_apis::FileListCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback GetShareUrl(
 | 
|        const std::string& resource_id,
 | 
|        const GURL& embed_origin,
 | 
| -      const google_apis::GetShareUrlCallback& callback) OVERRIDE;
 | 
| +      const google_apis::GetShareUrlCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback GetAppList(
 | 
| -      const google_apis::AppListCallback& callback) OVERRIDE;
 | 
| +      const google_apis::AppListCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback TrashResource(
 | 
|        const std::string& resource_id,
 | 
| -      const google_apis::EntryActionCallback& callback) OVERRIDE;
 | 
| +      const google_apis::EntryActionCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback CopyResource(
 | 
|        const std::string& resource_id,
 | 
|        const std::string& parent_resource_id,
 | 
|        const std::string& new_title,
 | 
|        const base::Time& last_modified,
 | 
| -      const google_apis::FileResourceCallback& callback) OVERRIDE;
 | 
| +      const google_apis::FileResourceCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback UpdateResource(
 | 
|        const std::string& resource_id,
 | 
|        const std::string& parent_resource_id,
 | 
|        const std::string& new_title,
 | 
|        const base::Time& last_modified,
 | 
|        const base::Time& last_viewed_by_me,
 | 
| -      const google_apis::FileResourceCallback& callback) OVERRIDE;
 | 
| +      const google_apis::FileResourceCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback AddResourceToDirectory(
 | 
|        const std::string& parent_resource_id,
 | 
|        const std::string& resource_id,
 | 
| -      const google_apis::EntryActionCallback& callback) OVERRIDE;
 | 
| +      const google_apis::EntryActionCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback InitiateUploadNewFile(
 | 
|        const std::string& content_type,
 | 
|        int64 content_length,
 | 
|        const std::string& parent_resource_id,
 | 
|        const std::string& title,
 | 
|        const InitiateUploadNewFileOptions& options,
 | 
| -      const google_apis::InitiateUploadCallback& callback) OVERRIDE;
 | 
| +      const google_apis::InitiateUploadCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback InitiateUploadExistingFile(
 | 
|        const std::string& content_type,
 | 
|        int64 content_length,
 | 
|        const std::string& resource_id,
 | 
|        const InitiateUploadExistingFileOptions& options,
 | 
| -      const google_apis::InitiateUploadCallback& callback) OVERRIDE;
 | 
| +      const google_apis::InitiateUploadCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback ResumeUpload(
 | 
|        const GURL& upload_url,
 | 
|        int64 start_position,
 | 
| @@ -149,23 +149,23 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
 | 
|        const std::string& content_type,
 | 
|        const base::FilePath& local_file_path,
 | 
|        const google_apis::drive::UploadRangeCallback& callback,
 | 
| -      const google_apis::ProgressCallback& progress_callback) OVERRIDE;
 | 
| +      const google_apis::ProgressCallback& progress_callback) override;
 | 
|    virtual google_apis::CancelCallback GetUploadStatus(
 | 
|        const GURL& upload_url,
 | 
|        int64 content_length,
 | 
| -      const google_apis::drive::UploadRangeCallback& callback) OVERRIDE;
 | 
| +      const google_apis::drive::UploadRangeCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback AuthorizeApp(
 | 
|        const std::string& resource_id,
 | 
|        const std::string& app_id,
 | 
| -      const google_apis::AuthorizeAppCallback& callback) OVERRIDE;
 | 
| +      const google_apis::AuthorizeAppCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback UninstallApp(
 | 
|        const std::string& app_id,
 | 
| -      const google_apis::EntryActionCallback& callback) OVERRIDE;
 | 
| +      const google_apis::EntryActionCallback& callback) override;
 | 
|    virtual google_apis::CancelCallback AddPermission(
 | 
|        const std::string& resource_id,
 | 
|        const std::string& email,
 | 
|        google_apis::drive::PermissionRole role,
 | 
| -      const google_apis::EntryActionCallback& callback) OVERRIDE;
 | 
| +      const google_apis::EntryActionCallback& callback) override;
 | 
|  
 | 
|   private:
 | 
|    base::WeakPtr<DriveServiceWrapper> wrapper_;
 | 
| 
 |