Replacing the OVERRIDE with override and FINAL with final in storage

This step is a giant search and replace for OVERRIDE and FINAL to
replace them with their lowercase versions.

BUG=417463

Review URL: https://codereview.chromium.org/624063003

Cr-Commit-Position: refs/heads/master@{#298376}

42 files changed, 272 insertions, 272 deletions

diff --git a/storage/browser/blob/blob_url_request_job.h b/storage/browser/blob/blob_url_request_job.h
index 58b6620..f8a4968 100644
--- a/storage/browser/blob/blob_url_request_job.h
+++ b/storage/browser/blob/blob_url_request_job.h
@@ -43,16 +43,16 @@ class STORAGE_EXPORT BlobURLRequestJob
                     base::MessageLoopProxy* resolving_message_loop_proxy);
 
   // net::URLRequestJob methods.
-  virtual void Start() OVERRIDE;
-  virtual void Kill() OVERRIDE;
+  virtual void Start() override;
+  virtual void Kill() override;
   virtual bool ReadRawData(net::IOBuffer* buf,
                            int buf_size,
-                           int* bytes_read) OVERRIDE;
-  virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
-  virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
-  virtual int GetResponseCode() const OVERRIDE;
+                           int* bytes_read) override;
+  virtual bool GetMimeType(std::string* mime_type) const override;
+  virtual void GetResponseInfo(net::HttpResponseInfo* info) override;
+  virtual int GetResponseCode() const override;
   virtual void SetExtraRequestHeaders(
-      const net::HttpRequestHeaders& headers) OVERRIDE;
+      const net::HttpRequestHeaders& headers) override;
 
  protected:
   virtual ~BlobURLRequestJob();
diff --git a/storage/browser/blob/blob_url_request_job_factory.h b/storage/browser/blob/blob_url_request_job_factory.h
index e1769eb..f10e34c 100644
--- a/storage/browser/blob/blob_url_request_job_factory.h
+++ b/storage/browser/blob/blob_url_request_job_factory.h
@@ -53,7 +53,7 @@ class STORAGE_EXPORT BlobProtocolHandler
 
   virtual net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
+      net::NetworkDelegate* network_delegate) const override;
 
  private:
   scoped_refptr<BlobData> LookupBlobData(
diff --git a/storage/browser/blob/local_file_stream_reader.h b/storage/browser/blob/local_file_stream_reader.h
index b9e3328..2d401af 100644
--- a/storage/browser/blob/local_file_stream_reader.h
+++ b/storage/browser/blob/local_file_stream_reader.h
@@ -37,9 +37,9 @@ class STORAGE_EXPORT LocalFileStreamReader
 
   // FileStreamReader overrides.
   virtual int Read(net::IOBuffer* buf, int buf_len,
-                   const net::CompletionCallback& callback) OVERRIDE;
+                   const net::CompletionCallback& callback) override;
   virtual int64 GetLength(
-      const net::Int64CompletionCallback& callback) OVERRIDE;
+      const net::Int64CompletionCallback& callback) override;
 
  private:
   friend class FileStreamReader;
diff --git a/storage/browser/blob/view_blob_internals_job.h b/storage/browser/blob/view_blob_internals_job.h
index 3fc2f08..9fc3850 100644
--- a/storage/browser/blob/view_blob_internals_job.h
+++ b/storage/browser/blob/view_blob_internals_job.h
@@ -29,14 +29,14 @@ class STORAGE_EXPORT ViewBlobInternalsJob
                        net::NetworkDelegate* network_delegate,
                        BlobStorageContext* blob_storage_context);
 
-  virtual void Start() OVERRIDE;
+  virtual void Start() override;
   virtual int GetData(std::string* mime_type,
                       std::string* charset,
                       std::string* data,
-                      const net::CompletionCallback& callback) const OVERRIDE;
+                      const net::CompletionCallback& callback) const override;
   virtual bool IsRedirectResponse(GURL* location,
-                                  int* http_status_code) OVERRIDE;
-  virtual void Kill() OVERRIDE;
+                                  int* http_status_code) override;
+  virtual void Kill() override;
 
  private:
   virtual ~ViewBlobInternalsJob();
diff --git a/storage/browser/database/database_quota_client.h b/storage/browser/database/database_quota_client.h
index ae276c7..c561f32 100644
--- a/storage/browser/database/database_quota_client.h
+++ b/storage/browser/database/database_quota_client.h
@@ -30,20 +30,20 @@ class STORAGE_EXPORT_PRIVATE DatabaseQuotaClient
   virtual ~DatabaseQuotaClient();
 
   // QuotaClient method overrides
-  virtual ID id() const OVERRIDE;
-  virtual void OnQuotaManagerDestroyed() OVERRIDE;
+  virtual ID id() const override;
+  virtual void OnQuotaManagerDestroyed() override;
   virtual void GetOriginUsage(const GURL& origin_url,
                               storage::StorageType type,
-                              const GetUsageCallback& callback) OVERRIDE;
+                              const GetUsageCallback& callback) override;
   virtual void GetOriginsForType(storage::StorageType type,
-                                 const GetOriginsCallback& callback) OVERRIDE;
+                                 const GetOriginsCallback& callback) override;
   virtual void GetOriginsForHost(storage::StorageType type,
                                  const std::string& host,
-                                 const GetOriginsCallback& callback) OVERRIDE;
+                                 const GetOriginsCallback& callback) override;
   virtual void DeleteOriginData(const GURL& origin,
                                 storage::StorageType type,
-                                const DeletionCallback& callback) OVERRIDE;
-  virtual bool DoesSupport(storage::StorageType type) const OVERRIDE;
+                                const DeletionCallback& callback) override;
+  virtual bool DoesSupport(storage::StorageType type) const override;
 
  private:
   scoped_refptr<base::MessageLoopProxy> db_tracker_thread_;
diff --git a/storage/browser/fileapi/async_file_util_adapter.h b/storage/browser/fileapi/async_file_util_adapter.h
index 4ba4542..7dc4982 100644
--- a/storage/browser/fileapi/async_file_util_adapter.h
+++ b/storage/browser/fileapi/async_file_util_adapter.h
@@ -42,70 +42,70 @@ class STORAGE_EXPORT AsyncFileUtilAdapter
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
       int file_flags,
-      const CreateOrOpenCallback& callback) OVERRIDE;
+      const CreateOrOpenCallback& callback) override;
   virtual void EnsureFileExists(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
-      const EnsureFileExistsCallback& callback) OVERRIDE;
+      const EnsureFileExistsCallback& callback) override;
   virtual void CreateDirectory(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
       bool exclusive,
       bool recursive,
-      const StatusCallback& callback) OVERRIDE;
+      const StatusCallback& callback) override;
   virtual void GetFileInfo(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
-      const GetFileInfoCallback& callback) OVERRIDE;
+      const GetFileInfoCallback& callback) override;
   virtual void ReadDirectory(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
-      const ReadDirectoryCallback& callback) OVERRIDE;
+      const ReadDirectoryCallback& callback) override;
   virtual void Touch(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
       const base::Time& last_access_time,
       const base::Time& last_modified_time,
-      const StatusCallback& callback) OVERRIDE;
+      const StatusCallback& callback) override;
   virtual void Truncate(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
       int64 length,
-      const StatusCallback& callback) OVERRIDE;
+      const StatusCallback& callback) override;
   virtual void CopyFileLocal(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& src_url,
       const FileSystemURL& dest_url,
       CopyOrMoveOption option,
       const CopyFileProgressCallback& progress_callback,
-      const StatusCallback& callback) OVERRIDE;
+      const StatusCallback& callback) override;
   virtual void MoveFileLocal(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& src_url,
       const FileSystemURL& dest_url,
       CopyOrMoveOption option,
-      const StatusCallback& callback) OVERRIDE;
+      const StatusCallback& callback) override;
   virtual void CopyInForeignFile(
       scoped_ptr<FileSystemOperationContext> context,
       const base::FilePath& src_file_path,
       const FileSystemURL& dest_url,
-      const StatusCallback& callback) OVERRIDE;
+      const StatusCallback& callback) override;
   virtual void DeleteFile(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
-      const StatusCallback& callback) OVERRIDE;
+      const StatusCallback& callback) override;
   virtual void DeleteDirectory(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
-      const StatusCallback& callback) OVERRIDE;
+      const StatusCallback& callback) override;
   virtual void DeleteRecursively(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
-      const StatusCallback& callback) OVERRIDE;
+      const StatusCallback& callback) override;
   virtual void CreateSnapshotFile(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
-      const CreateSnapshotFileCallback& callback) OVERRIDE;
+      const CreateSnapshotFileCallback& callback) override;
 
  private:
   scoped_ptr<FileSystemFileUtil> sync_file_util_;
diff --git a/storage/browser/fileapi/copy_or_move_operation_delegate.cc b/storage/browser/fileapi/copy_or_move_operation_delegate.cc
index aa6b059..a1e212b 100644
--- a/storage/browser/fileapi/copy_or_move_operation_delegate.cc
+++ b/storage/browser/fileapi/copy_or_move_operation_delegate.cc
@@ -61,7 +61,7 @@ class CopyOrMoveOnSameFileSystemImpl
   }
 
   virtual void Run(
-      const CopyOrMoveOperationDelegate::StatusCallback& callback) OVERRIDE {
+      const CopyOrMoveOperationDelegate::StatusCallback& callback) override {
     if (operation_type_ == CopyOrMoveOperationDelegate::OPERATION_MOVE) {
       operation_runner_->MoveFileLocal(src_url_, dest_url_, option_, callback);
     } else {
@@ -70,7 +70,7 @@ class CopyOrMoveOnSameFileSystemImpl
     }
   }
 
-  virtual void Cancel() OVERRIDE {
+  virtual void Cancel() override {
     // We can do nothing for the copy/move operation on a local file system.
     // Assuming the operation is quickly done, it should be ok to just wait
     // for the completion.
@@ -114,7 +114,7 @@ class SnapshotCopyOrMoveImpl
   }
 
   virtual void Run(
-      const CopyOrMoveOperationDelegate::StatusCallback& callback) OVERRIDE {
+      const CopyOrMoveOperationDelegate::StatusCallback& callback) override {
     file_progress_callback_.Run(0);
     operation_runner_->CreateSnapshotFile(
         src_url_,
@@ -122,7 +122,7 @@ class SnapshotCopyOrMoveImpl
                    weak_factory_.GetWeakPtr(), callback));
   }
 
-  virtual void Cancel() OVERRIDE {
+  virtual void Cancel() override {
     cancel_requested_ = true;
   }
 
@@ -389,7 +389,7 @@ class StreamCopyOrMoveImpl
         weak_factory_(this) {}
 
   virtual void Run(
-      const CopyOrMoveOperationDelegate::StatusCallback& callback) OVERRIDE {
+      const CopyOrMoveOperationDelegate::StatusCallback& callback) override {
     // Reader can be created even if the entry does not exist or the entry is
     // a directory. To check errors before destination file creation,
     // check metadata first.
@@ -399,7 +399,7 @@ class StreamCopyOrMoveImpl
                    weak_factory_.GetWeakPtr(), callback));
   }
 
-  virtual void Cancel() OVERRIDE {
+  virtual void Cancel() override {
     cancel_requested_ = true;
     if (copy_helper_)
       copy_helper_->Cancel();
diff --git a/storage/browser/fileapi/copy_or_move_operation_delegate.h b/storage/browser/fileapi/copy_or_move_operation_delegate.h
index 0b97d1c..8173117 100644
--- a/storage/browser/fileapi/copy_or_move_operation_delegate.h
+++ b/storage/browser/fileapi/copy_or_move_operation_delegate.h
@@ -101,18 +101,18 @@ class CopyOrMoveOperationDelegate
   virtual ~CopyOrMoveOperationDelegate();
 
   // RecursiveOperationDelegate overrides:
-  virtual void Run() OVERRIDE;
-  virtual void RunRecursively() OVERRIDE;
+  virtual void Run() override;
+  virtual void RunRecursively() override;
   virtual void ProcessFile(const FileSystemURL& url,
-                           const StatusCallback& callback) OVERRIDE;
+                           const StatusCallback& callback) override;
   virtual void ProcessDirectory(const FileSystemURL& url,
-                                const StatusCallback& callback) OVERRIDE;
+                                const StatusCallback& callback) override;
   virtual void PostProcessDirectory(const FileSystemURL& url,
-                                    const StatusCallback& callback) OVERRIDE;
+                                    const StatusCallback& callback) override;
 
 
  protected:
-  virtual void OnCancel() OVERRIDE;
+  virtual void OnCancel() override;
 
  private:
   void DidCopyOrMoveFile(const FileSystemURL& src_url,
diff --git a/storage/browser/fileapi/dragged_file_util.cc b/storage/browser/fileapi/dragged_file_util.cc
index 1f15188..7c96d64 100644
--- a/storage/browser/fileapi/dragged_file_util.cc
+++ b/storage/browser/fileapi/dragged_file_util.cc
@@ -32,16 +32,16 @@ class SetFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
   virtual ~SetFileEnumerator() {}
 
   // AbstractFileEnumerator overrides.
-  virtual base::FilePath Next() OVERRIDE {
+  virtual base::FilePath Next() override {
     if (file_iter_ == files_.end())
       return base::FilePath();
     base::FilePath platform_file = (file_iter_++)->path;
     NativeFileUtil::GetFileInfo(platform_file, &file_info_);
     return platform_file;
   }
-  virtual int64 Size() OVERRIDE { return file_info_.size; }
-  virtual bool IsDirectory() OVERRIDE { return file_info_.is_directory; }
-  virtual base::Time LastModifiedTime() OVERRIDE {
+  virtual int64 Size() override { return file_info_.size; }
+  virtual bool IsDirectory() override { return file_info_.is_directory; }
+  virtual base::Time LastModifiedTime() override {
     return file_info_.last_modified;
   }
 
diff --git a/storage/browser/fileapi/dragged_file_util.h b/storage/browser/fileapi/dragged_file_util.h
index 205e8ef..a29eafa 100644
--- a/storage/browser/fileapi/dragged_file_util.h
+++ b/storage/browser/fileapi/dragged_file_util.h
@@ -27,10 +27,10 @@ class STORAGE_EXPORT_PRIVATE DraggedFileUtil
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       base::File::Info* file_info,
-      base::FilePath* platform_path) OVERRIDE;
+      base::FilePath* platform_path) override;
   virtual scoped_ptr<AbstractFileEnumerator> CreateFileEnumerator(
       FileSystemOperationContext* context,
-      const FileSystemURL& root_url) OVERRIDE;
+      const FileSystemURL& root_url) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DraggedFileUtil);
diff --git a/storage/browser/fileapi/external_mount_points.h b/storage/browser/fileapi/external_mount_points.h
index 26468c5..d80c511 100644
--- a/storage/browser/fileapi/external_mount_points.h
+++ b/storage/browser/fileapi/external_mount_points.h
@@ -65,22 +65,22 @@ class STORAGE_EXPORT ExternalMountPoints
                           const base::FilePath& path);
 
   // MountPoints overrides.
-  virtual bool HandlesFileSystemMountType(FileSystemType type) const OVERRIDE;
-  virtual bool RevokeFileSystem(const std::string& mount_name) OVERRIDE;
+  virtual bool HandlesFileSystemMountType(FileSystemType type) const override;
+  virtual bool RevokeFileSystem(const std::string& mount_name) override;
   virtual bool GetRegisteredPath(const std::string& mount_name,
-                                 base::FilePath* path) const OVERRIDE;
+                                 base::FilePath* path) const override;
   virtual bool CrackVirtualPath(
       const base::FilePath& virtual_path,
       std::string* mount_name,
       FileSystemType* type,
       std::string* cracked_id,
       base::FilePath* path,
-      FileSystemMountOption* mount_option) const OVERRIDE;
-  virtual FileSystemURL CrackURL(const GURL& url) const OVERRIDE;
+      FileSystemMountOption* mount_option) const override;
+  virtual FileSystemURL CrackURL(const GURL& url) const override;
   virtual FileSystemURL CreateCrackedFileSystemURL(
       const GURL& origin,
       FileSystemType type,
-      const base::FilePath& path) const OVERRIDE;
+      const base::FilePath& path) const override;
 
   // Returns a list of registered MountPointInfos (of <mount_name, path>).
   void AddMountPointInfosTo(std::vector<MountPointInfo>* mount_points) const;
@@ -130,7 +130,7 @@ class STORAGE_EXPORT ExternalMountPoints
 
   // MountPoint overrides.
   virtual FileSystemURL CrackFileSystemURL(
-      const FileSystemURL& url) const OVERRIDE;
+      const FileSystemURL& url) const override;
 
   // Performs sanity checks on the new mount point.
   // Checks the following:
diff --git a/storage/browser/fileapi/file_system_dir_url_request_job.h b/storage/browser/fileapi/file_system_dir_url_request_job.h
index 8c71cdf..3423182 100644
--- a/storage/browser/fileapi/file_system_dir_url_request_job.h
+++ b/storage/browser/fileapi/file_system_dir_url_request_job.h
@@ -32,15 +32,15 @@ class STORAGE_EXPORT_PRIVATE FileSystemDirURLRequestJob
       FileSystemContext* file_system_context);
 
   // URLRequestJob methods:
-  virtual void Start() OVERRIDE;
-  virtual void Kill() OVERRIDE;
+  virtual void Start() override;
+  virtual void Kill() override;
   virtual bool ReadRawData(net::IOBuffer* buf,
                            int buf_size,
-                           int* bytes_read) OVERRIDE;
-  virtual bool GetCharset(std::string* charset) OVERRIDE;
+                           int* bytes_read) override;
+  virtual bool GetCharset(std::string* charset) override;
 
   // FilterContext methods (via URLRequestJob):
-  virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
+  virtual bool GetMimeType(std::string* mime_type) const override;
   // TODO(adamk): Implement GetResponseInfo and GetResponseCode to simulate
   // an HTTP response.
 
diff --git a/storage/browser/fileapi/file_system_file_stream_reader.h b/storage/browser/fileapi/file_system_file_stream_reader.h
index 3fe075b6..6b9273a 100644
--- a/storage/browser/fileapi/file_system_file_stream_reader.h
+++ b/storage/browser/fileapi/file_system_file_stream_reader.h
@@ -39,9 +39,9 @@ class STORAGE_EXPORT_PRIVATE FileSystemFileStreamReader
 
   // FileStreamReader overrides.
   virtual int Read(net::IOBuffer* buf, int buf_len,
-                   const net::CompletionCallback& callback) OVERRIDE;
+                   const net::CompletionCallback& callback) override;
   virtual int64 GetLength(
-      const net::Int64CompletionCallback& callback) OVERRIDE;
+      const net::Int64CompletionCallback& callback) override;
 
  private:
   friend class storage::FileStreamReader;
diff --git a/storage/browser/fileapi/file_system_file_util.h b/storage/browser/fileapi/file_system_file_util.h
index 868d091..77fea58 100644
--- a/storage/browser/fileapi/file_system_file_util.h
+++ b/storage/browser/fileapi/file_system_file_util.h
@@ -49,10 +49,10 @@ class STORAGE_EXPORT FileSystemFileUtil {
 
   class STORAGE_EXPORT EmptyFileEnumerator
       : public AbstractFileEnumerator {
-    virtual base::FilePath Next() OVERRIDE;
-    virtual int64 Size() OVERRIDE;
-    virtual base::Time LastModifiedTime() OVERRIDE;
-    virtual bool IsDirectory() OVERRIDE;
+    virtual base::FilePath Next() override;
+    virtual int64 Size() override;
+    virtual base::Time LastModifiedTime() override;
+    virtual bool IsDirectory() override;
   };
 
   virtual ~FileSystemFileUtil() {}
diff --git a/storage/browser/fileapi/file_system_operation_impl.h b/storage/browser/fileapi/file_system_operation_impl.h
index 76cf436..ca855d17 100644
--- a/storage/browser/fileapi/file_system_operation_impl.h
+++ b/storage/browser/fileapi/file_system_operation_impl.h
@@ -33,66 +33,66 @@ class STORAGE_EXPORT FileSystemOperationImpl
   // FileSystemOperation overrides.
   virtual void CreateFile(const FileSystemURL& url,
                           bool exclusive,
-                          const StatusCallback& callback) OVERRIDE;
+                          const StatusCallback& callback) override;
   virtual void CreateDirectory(const FileSystemURL& url,
                                bool exclusive,
                                bool recursive,
-                               const StatusCallback& callback) OVERRIDE;
+                               const StatusCallback& callback) override;
   virtual void Copy(const FileSystemURL& src_url,
                     const FileSystemURL& dest_url,
                     CopyOrMoveOption option,
                     const CopyProgressCallback& progress_callback,
-                    const StatusCallback& callback) OVERRIDE;
+                    const StatusCallback& callback) override;
   virtual void Move(const FileSystemURL& src_url,
                     const FileSystemURL& dest_url,
                     CopyOrMoveOption option,
-                    const StatusCallback& callback) OVERRIDE;
+                    const StatusCallback& callback) override;
   virtual void DirectoryExists(const FileSystemURL& url,
-                               const StatusCallback& callback) OVERRIDE;
+                               const StatusCallback& callback) override;
   virtual void FileExists(const FileSystemURL& url,
-                          const StatusCallback& callback) OVERRIDE;
+                          const StatusCallback& callback) override;
   virtual void GetMetadata(const FileSystemURL& url,
-                           const GetMetadataCallback& callback) OVERRIDE;
+                           const GetMetadataCallback& callback) override;
   virtual void ReadDirectory(const FileSystemURL& url,
-                             const ReadDirectoryCallback& callback) OVERRIDE;
+                             const ReadDirectoryCallback& callback) override;
   virtual void Remove(const FileSystemURL& url, bool recursive,
-                      const StatusCallback& callback) OVERRIDE;
+                      const StatusCallback& callback) override;
   virtual void Write(const FileSystemURL& url,
                      scoped_ptr<FileWriterDelegate> writer_delegate,
                      scoped_ptr<net::URLRequest> blob_request,
-                     const WriteCallback& callback) OVERRIDE;
+                     const WriteCallback& callback) override;
   virtual void Truncate(const FileSystemURL& url, int64 length,
-                        const StatusCallback& callback) OVERRIDE;
+                        const StatusCallback& callback) override;
   virtual void TouchFile(const FileSystemURL& url,
                          const base::Time& last_access_time,
                          const base::Time& last_modified_time,
-                         const StatusCallback& callback) OVERRIDE;
+                         const StatusCallback& callback) override;
   virtual void OpenFile(const FileSystemURL& url,
                         int file_flags,
-                        const OpenFileCallback& callback) OVERRIDE;
-  virtual void Cancel(const StatusCallback& cancel_callback) OVERRIDE;
+                        const OpenFileCallback& callback) override;
+  virtual void Cancel(const StatusCallback& cancel_callback) override;
   virtual void CreateSnapshotFile(
       const FileSystemURL& path,
-      const SnapshotFileCallback& callback) OVERRIDE;
+      const SnapshotFileCallback& callback) override;
   virtual void CopyInForeignFile(const base::FilePath& src_local_disk_path,
                                  const FileSystemURL& dest_url,
-                                 const StatusCallback& callback) OVERRIDE;
+                                 const StatusCallback& callback) override;
   virtual void RemoveFile(const FileSystemURL& url,
-                          const StatusCallback& callback) OVERRIDE;
+                          const StatusCallback& callback) override;
   virtual void RemoveDirectory(const FileSystemURL& url,
-                               const StatusCallback& callback) OVERRIDE;
+                               const StatusCallback& callback) override;
   virtual void CopyFileLocal(const FileSystemURL& src_url,
                              const FileSystemURL& dest_url,
                              CopyOrMoveOption option,
                              const CopyFileProgressCallback& progress_callback,
-                             const StatusCallback& callback) OVERRIDE;
+                             const StatusCallback& callback) override;
   virtual void MoveFileLocal(const FileSystemURL& src_url,
                              const FileSystemURL& dest_url,
                              CopyOrMoveOption option,
-                             const StatusCallback& callback) OVERRIDE;
+                             const StatusCallback& callback) override;
   virtual base::File::Error SyncGetPlatformPath(
       const FileSystemURL& url,
-      base::FilePath* platform_path) OVERRIDE;
+      base::FilePath* platform_path) override;
 
   FileSystemContext* file_system_context() const {
     return file_system_context_.get();
diff --git a/storage/browser/fileapi/file_system_quota_client.h b/storage/browser/fileapi/file_system_quota_client.h
index e82a0ed..f8dab3d 100644
--- a/storage/browser/fileapi/file_system_quota_client.h
+++ b/storage/browser/fileapi/file_system_quota_client.h
@@ -40,20 +40,20 @@ class STORAGE_EXPORT_PRIVATE FileSystemQuotaClient
   virtual ~FileSystemQuotaClient();
 
   // QuotaClient methods.
-  virtual storage::QuotaClient::ID id() const OVERRIDE;
-  virtual void OnQuotaManagerDestroyed() OVERRIDE;
+  virtual storage::QuotaClient::ID id() const override;
+  virtual void OnQuotaManagerDestroyed() override;
   virtual void GetOriginUsage(const GURL& origin_url,
                               storage::StorageType type,
-                              const GetUsageCallback& callback) OVERRIDE;
+                              const GetUsageCallback& callback) override;
   virtual void GetOriginsForType(storage::StorageType type,
-                                 const GetOriginsCallback& callback) OVERRIDE;
+                                 const GetOriginsCallback& callback) override;
   virtual void GetOriginsForHost(storage::StorageType type,
                                  const std::string& host,
-                                 const GetOriginsCallback& callback) OVERRIDE;
+                                 const GetOriginsCallback& callback) override;
   virtual void DeleteOriginData(const GURL& origin,
                                 storage::StorageType type,
-                                const DeletionCallback& callback) OVERRIDE;
-  virtual bool DoesSupport(storage::StorageType type) const OVERRIDE;
+                                const DeletionCallback& callback) override;
+  virtual bool DoesSupport(storage::StorageType type) const override;
 
  private:
   base::SequencedTaskRunner* file_task_runner() const;
diff --git a/storage/browser/fileapi/file_system_url_request_job.h b/storage/browser/fileapi/file_system_url_request_job.h
index 9910e5d..1729618 100644
--- a/storage/browser/fileapi/file_system_url_request_job.h
+++ b/storage/browser/fileapi/file_system_url_request_job.h
@@ -40,20 +40,20 @@ class STORAGE_EXPORT_PRIVATE FileSystemURLRequestJob
       FileSystemContext* file_system_context);
 
   // URLRequestJob methods:
-  virtual void Start() OVERRIDE;
-  virtual void Kill() OVERRIDE;
+  virtual void Start() override;
+  virtual void Kill() override;
   virtual bool ReadRawData(net::IOBuffer* buf,
                            int buf_size,
-                           int* bytes_read) OVERRIDE;
+                           int* bytes_read) override;
   virtual bool IsRedirectResponse(GURL* location,
-                                  int* http_status_code) OVERRIDE;
+                                  int* http_status_code) override;
   virtual void SetExtraRequestHeaders(
-      const net::HttpRequestHeaders& headers) OVERRIDE;
-  virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
-  virtual int GetResponseCode() const OVERRIDE;
+      const net::HttpRequestHeaders& headers) override;
+  virtual void GetResponseInfo(net::HttpResponseInfo* info) override;
+  virtual int GetResponseCode() const override;
 
   // FilterContext methods (via URLRequestJob):
-  virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
+  virtual bool GetMimeType(std::string* mime_type) const override;
 
  private:
   class CallbackDispatcher;
diff --git a/storage/browser/fileapi/file_system_url_request_job_factory.cc b/storage/browser/fileapi/file_system_url_request_job_factory.cc
index 68150e4..caf3273 100644
--- a/storage/browser/fileapi/file_system_url_request_job_factory.cc
+++ b/storage/browser/fileapi/file_system_url_request_job_factory.cc
@@ -25,7 +25,7 @@ class FileSystemProtocolHandler
 
   virtual net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
+      net::NetworkDelegate* network_delegate) const override;
 
  private:
   const std::string storage_domain_;
diff --git a/storage/browser/fileapi/file_writer_delegate.h b/storage/browser/fileapi/file_writer_delegate.h
index eefad4c..7636063 100644
--- a/storage/browser/fileapi/file_writer_delegate.h
+++ b/storage/browser/fileapi/file_writer_delegate.h
@@ -53,18 +53,18 @@ class STORAGE_EXPORT_PRIVATE FileWriterDelegate
 
   virtual void OnReceivedRedirect(net::URLRequest* request,
                                   const net::RedirectInfo& redirect_info,
-                                  bool* defer_redirect) OVERRIDE;
+                                  bool* defer_redirect) override;
   virtual void OnAuthRequired(net::URLRequest* request,
-                              net::AuthChallengeInfo* auth_info) OVERRIDE;
+                              net::AuthChallengeInfo* auth_info) override;
   virtual void OnCertificateRequested(
       net::URLRequest* request,
-      net::SSLCertRequestInfo* cert_request_info) OVERRIDE;
+      net::SSLCertRequestInfo* cert_request_info) override;
   virtual void OnSSLCertificateError(net::URLRequest* request,
                                      const net::SSLInfo& ssl_info,
-                                     bool fatal) OVERRIDE;
-  virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
+                                     bool fatal) override;
+  virtual void OnResponseStarted(net::URLRequest* request) override;
   virtual void OnReadCompleted(net::URLRequest* request,
-                               int bytes_read) OVERRIDE;
+                               int bytes_read) override;
 
  private:
   void OnGetFileInfoAndStartRequest(
diff --git a/storage/browser/fileapi/isolated_context.h b/storage/browser/fileapi/isolated_context.h
index aa18e9b..2501a99 100644
--- a/storage/browser/fileapi/isolated_context.h
+++ b/storage/browser/fileapi/isolated_context.h
@@ -141,22 +141,22 @@ class STORAGE_EXPORT IsolatedContext : public MountPoints {
                           std::vector<MountPointInfo>* files) const;
 
   // MountPoints overrides.
-  virtual bool HandlesFileSystemMountType(FileSystemType type) const OVERRIDE;
-  virtual bool RevokeFileSystem(const std::string& filesystem_id) OVERRIDE;
+  virtual bool HandlesFileSystemMountType(FileSystemType type) const override;
+  virtual bool RevokeFileSystem(const std::string& filesystem_id) override;
   virtual bool GetRegisteredPath(const std::string& filesystem_id,
-                                 base::FilePath* path) const OVERRIDE;
+                                 base::FilePath* path) const override;
   virtual bool CrackVirtualPath(
       const base::FilePath& virtual_path,
       std::string* filesystem_id,
       FileSystemType* type,
       std::string* cracked_id,
       base::FilePath* path,
-      FileSystemMountOption* mount_option) const OVERRIDE;
-  virtual FileSystemURL CrackURL(const GURL& url) const OVERRIDE;
+      FileSystemMountOption* mount_option) const override;
+  virtual FileSystemURL CrackURL(const GURL& url) const override;
   virtual FileSystemURL CreateCrackedFileSystemURL(
       const GURL& origin,
       FileSystemType type,
-      const base::FilePath& path) const OVERRIDE;
+      const base::FilePath& path) const override;
 
   // Returns the virtual root path that looks like /<filesystem_id>.
   base::FilePath CreateVirtualRootPath(const std::string& filesystem_id) const;
@@ -178,7 +178,7 @@ class STORAGE_EXPORT IsolatedContext : public MountPoints {
 
   // MountPoints overrides.
   virtual FileSystemURL CrackFileSystemURL(
-      const FileSystemURL& url) const OVERRIDE;
+      const FileSystemURL& url) const override;
 
   // Unregisters a file system of given |filesystem_id|. Must be called with
   // lock_ held.  Returns true if the file system is unregistered.
diff --git a/storage/browser/fileapi/isolated_file_system_backend.h b/storage/browser/fileapi/isolated_file_system_backend.h
index b6adcf0..44e8a24 100644
--- a/storage/browser/fileapi/isolated_file_system_backend.h
+++ b/storage/browser/fileapi/isolated_file_system_backend.h
@@ -19,40 +19,40 @@ class IsolatedFileSystemBackend : public FileSystemBackend {
   virtual ~IsolatedFileSystemBackend();
 
   // FileSystemBackend implementation.
-  virtual bool CanHandleType(FileSystemType type) const OVERRIDE;
-  virtual void Initialize(FileSystemContext* context) OVERRIDE;
+  virtual bool CanHandleType(FileSystemType type) const override;
+  virtual void Initialize(FileSystemContext* context) override;
   virtual void ResolveURL(const FileSystemURL& url,
                           OpenFileSystemMode mode,
-                          const OpenFileSystemCallback& callback) OVERRIDE;
-  virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) OVERRIDE;
-  virtual WatcherManager* GetWatcherManager(FileSystemType type) OVERRIDE;
+                          const OpenFileSystemCallback& callback) override;
+  virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) override;
+  virtual WatcherManager* GetWatcherManager(FileSystemType type) override;
   virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
       FileSystemType type,
-      base::File::Error* error_code) OVERRIDE;
+      base::File::Error* error_code) override;
   virtual FileSystemOperation* CreateFileSystemOperation(
       const FileSystemURL& url,
       FileSystemContext* context,
-      base::File::Error* error_code) const OVERRIDE;
-  virtual bool SupportsStreaming(const FileSystemURL& url) const OVERRIDE;
+      base::File::Error* error_code) const override;
+  virtual bool SupportsStreaming(const FileSystemURL& url) const override;
   virtual bool HasInplaceCopyImplementation(
-      storage::FileSystemType type) const OVERRIDE;
+      storage::FileSystemType type) const override;
   virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader(
       const FileSystemURL& url,
       int64 offset,
       int64 max_bytes_to_read,
       const base::Time& expected_modification_time,
-      FileSystemContext* context) const OVERRIDE;
+      FileSystemContext* context) const override;
   virtual scoped_ptr<FileStreamWriter> CreateFileStreamWriter(
       const FileSystemURL& url,
       int64 offset,
-      FileSystemContext* context) const OVERRIDE;
-  virtual FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
+      FileSystemContext* context) const override;
+  virtual FileSystemQuotaUtil* GetQuotaUtil() override;
   virtual const UpdateObserverList* GetUpdateObservers(
-      FileSystemType type) const OVERRIDE;
+      FileSystemType type) const override;
   virtual const ChangeObserverList* GetChangeObservers(
-      FileSystemType type) const OVERRIDE;
+      FileSystemType type) const override;
   virtual const AccessObserverList* GetAccessObservers(
-      FileSystemType type) const OVERRIDE;
+      FileSystemType type) const override;
 
  private:
   scoped_ptr<AsyncFileUtilAdapter> isolated_file_util_;
diff --git a/storage/browser/fileapi/local_file_stream_writer.h b/storage/browser/fileapi/local_file_stream_writer.h
index 17417d0..c955d58 100644
--- a/storage/browser/fileapi/local_file_stream_writer.h
+++ b/storage/browser/fileapi/local_file_stream_writer.h
@@ -35,9 +35,9 @@ class STORAGE_EXPORT LocalFileStreamWriter
 
   // FileStreamWriter overrides.
   virtual int Write(net::IOBuffer* buf, int buf_len,
-                    const net::CompletionCallback& callback) OVERRIDE;
-  virtual int Cancel(const net::CompletionCallback& callback) OVERRIDE;
-  virtual int Flush(const net::CompletionCallback& callback) OVERRIDE;
+                    const net::CompletionCallback& callback) override;
+  virtual int Cancel(const net::CompletionCallback& callback) override;
+  virtual int Flush(const net::CompletionCallback& callback) override;
 
  private:
   friend class content::LocalFileStreamWriterTest;
diff --git a/storage/browser/fileapi/local_file_util.cc b/storage/browser/fileapi/local_file_util.cc
index 19ce59e..81bd865 100644
--- a/storage/browser/fileapi/local_file_util.cc
+++ b/storage/browser/fileapi/local_file_util.cc
@@ -34,10 +34,10 @@ class LocalFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
 
   virtual ~LocalFileEnumerator() {}
 
-  virtual base::FilePath Next() OVERRIDE;
-  virtual int64 Size() OVERRIDE;
-  virtual base::Time LastModifiedTime() OVERRIDE;
-  virtual bool IsDirectory() OVERRIDE;
+  virtual base::FilePath Next() override;
+  virtual int64 Size() override;
+  virtual base::Time LastModifiedTime() override;
+  virtual bool IsDirectory() override;
 
  private:
   base::FileEnumerator file_enum_;
diff --git a/storage/browser/fileapi/local_file_util.h b/storage/browser/fileapi/local_file_util.h
index dbbdef0..517494a 100644
--- a/storage/browser/fileapi/local_file_util.h
+++ b/storage/browser/fileapi/local_file_util.h
@@ -32,58 +32,58 @@ class STORAGE_EXPORT LocalFileUtil
   virtual base::File CreateOrOpen(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
-      int file_flags) OVERRIDE;
+      int file_flags) override;
   virtual base::File::Error EnsureFileExists(
       FileSystemOperationContext* context,
-      const FileSystemURL& url, bool* created) OVERRIDE;
+      const FileSystemURL& url, bool* created) override;
   virtual base::File::Error CreateDirectory(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       bool exclusive,
-      bool recursive) OVERRIDE;
+      bool recursive) override;
   virtual base::File::Error GetFileInfo(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       base::File::Info* file_info,
-      base::FilePath* platform_file) OVERRIDE;
+      base::FilePath* platform_file) override;
   virtual scoped_ptr<AbstractFileEnumerator> CreateFileEnumerator(
       FileSystemOperationContext* context,
-      const FileSystemURL& root_url) OVERRIDE;
+      const FileSystemURL& root_url) override;
   virtual base::File::Error GetLocalFilePath(
       FileSystemOperationContext* context,
       const FileSystemURL& file_system_url,
-      base::FilePath* local_file_path) OVERRIDE;
+      base::FilePath* local_file_path) override;
   virtual base::File::Error Touch(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       const base::Time& last_access_time,
-      const base::Time& last_modified_time) OVERRIDE;
+      const base::Time& last_modified_time) override;
   virtual base::File::Error Truncate(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
-      int64 length) OVERRIDE;
+      int64 length) override;
   virtual base::File::Error CopyOrMoveFile(
       FileSystemOperationContext* context,
       const FileSystemURL& src_url,
       const FileSystemURL& dest_url,
       CopyOrMoveOption option,
-      bool copy) OVERRIDE;
+      bool copy) override;
   virtual base::File::Error CopyInForeignFile(
       FileSystemOperationContext* context,
       const base::FilePath& src_file_path,
-      const FileSystemURL& dest_url) OVERRIDE;
+      const FileSystemURL& dest_url) override;
   virtual base::File::Error DeleteFile(
       FileSystemOperationContext* context,
-      const FileSystemURL& url) OVERRIDE;
+      const FileSystemURL& url) override;
   virtual base::File::Error DeleteDirectory(
       FileSystemOperationContext* context,
-      const FileSystemURL& url) OVERRIDE;
+      const FileSystemURL& url) override;
   virtual storage::ScopedFile CreateSnapshotFile(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       base::File::Error* error,
       base::File::Info* file_info,
-      base::FilePath* platform_path) OVERRIDE;
+      base::FilePath* platform_path) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LocalFileUtil);
diff --git a/storage/browser/fileapi/native_file_util.cc b/storage/browser/fileapi/native_file_util.cc
index b44179c..b1ffd3d 100644
--- a/storage/browser/fileapi/native_file_util.cc
+++ b/storage/browser/fileapi/native_file_util.cc
@@ -83,10 +83,10 @@ class NativeFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
 
   virtual ~NativeFileEnumerator() {}
 
-  virtual base::FilePath Next() OVERRIDE;
-  virtual int64 Size() OVERRIDE;
-  virtual base::Time LastModifiedTime() OVERRIDE;
-  virtual bool IsDirectory() OVERRIDE;
+  virtual base::FilePath Next() override;
+  virtual int64 Size() override;
+  virtual base::Time LastModifiedTime() override;
+  virtual bool IsDirectory() override;
 
  private:
   base::FileEnumerator file_enum_;
diff --git a/storage/browser/fileapi/obfuscated_file_util.cc b/storage/browser/fileapi/obfuscated_file_util.cc
index 4e202eb..aa6a28c 100644
--- a/storage/browser/fileapi/obfuscated_file_util.cc
+++ b/storage/browser/fileapi/obfuscated_file_util.cc
@@ -132,7 +132,7 @@ class ObfuscatedFileEnumerator
 
   virtual ~ObfuscatedFileEnumerator() {}
 
-  virtual base::FilePath Next() OVERRIDE {
+  virtual base::FilePath Next() override {
     ProcessRecurseQueue();
     if (display_stack_.empty())
       return base::FilePath();
@@ -158,15 +158,15 @@ class ObfuscatedFileEnumerator
     return virtual_path;
   }
 
-  virtual int64 Size() OVERRIDE {
+  virtual int64 Size() override {
     return current_platform_file_info_.size;
   }
 
-  virtual base::Time LastModifiedTime() OVERRIDE {
+  virtual base::Time LastModifiedTime() override {
     return current_platform_file_info_.last_modified;
   }
 
-  virtual bool IsDirectory() OVERRIDE {
+  virtual bool IsDirectory() override {
     return current_platform_file_info_.is_directory;
   }
 
@@ -220,7 +220,7 @@ class ObfuscatedOriginEnumerator
   virtual ~ObfuscatedOriginEnumerator() {}
 
   // Returns the next origin.  Returns empty if there are no more origins.
-  virtual GURL Next() OVERRIDE {
+  virtual GURL Next() override {
     OriginRecord record;
     if (!origins_.empty()) {
       record = origins_.back();
@@ -231,7 +231,7 @@ class ObfuscatedOriginEnumerator
   }
 
   // Returns the current origin's information.
-  virtual bool HasTypeDirectory(const std::string& type_string) const OVERRIDE {
+  virtual bool HasTypeDirectory(const std::string& type_string) const override {
     if (current_.path.empty())
       return false;
     if (type_string.empty()) {
diff --git a/storage/browser/fileapi/obfuscated_file_util.h b/storage/browser/fileapi/obfuscated_file_util.h
index 822a85d..a597ccd 100644
--- a/storage/browser/fileapi/obfuscated_file_util.h
+++ b/storage/browser/fileapi/obfuscated_file_util.h
@@ -114,58 +114,58 @@ class STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
   virtual base::File CreateOrOpen(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
-      int file_flags) OVERRIDE;
+      int file_flags) override;
   virtual base::File::Error EnsureFileExists(
       FileSystemOperationContext* context,
-      const FileSystemURL& url, bool* created) OVERRIDE;
+      const FileSystemURL& url, bool* created) override;
   virtual base::File::Error CreateDirectory(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       bool exclusive,
-      bool recursive) OVERRIDE;
+      bool recursive) override;
   virtual base::File::Error GetFileInfo(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       base::File::Info* file_info,
-      base::FilePath* platform_file) OVERRIDE;
+      base::FilePath* platform_file) override;
   virtual scoped_ptr<AbstractFileEnumerator> CreateFileEnumerator(
       FileSystemOperationContext* context,
-      const FileSystemURL& root_url) OVERRIDE;
+      const FileSystemURL& root_url) override;
   virtual base::File::Error GetLocalFilePath(
       FileSystemOperationContext* context,
       const FileSystemURL& file_system_url,
-      base::FilePath* local_path) OVERRIDE;
+      base::FilePath* local_path) override;
   virtual base::File::Error Touch(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       const base::Time& last_access_time,
-      const base::Time& last_modified_time) OVERRIDE;
+      const base::Time& last_modified_time) override;
   virtual base::File::Error Truncate(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
-      int64 length) OVERRIDE;
+      int64 length) override;
   virtual base::File::Error CopyOrMoveFile(
       FileSystemOperationContext* context,
       const FileSystemURL& src_url,
       const FileSystemURL& dest_url,
       CopyOrMoveOption option,
-      bool copy) OVERRIDE;
+      bool copy) override;
   virtual base::File::Error CopyInForeignFile(
         FileSystemOperationContext* context,
         const base::FilePath& src_file_path,
-        const FileSystemURL& dest_url) OVERRIDE;
+        const FileSystemURL& dest_url) override;
   virtual base::File::Error DeleteFile(
       FileSystemOperationContext* context,
-      const FileSystemURL& url) OVERRIDE;
+      const FileSystemURL& url) override;
   virtual base::File::Error DeleteDirectory(
       FileSystemOperationContext* context,
-      const FileSystemURL& url) OVERRIDE;
+      const FileSystemURL& url) override;
   virtual storage::ScopedFile CreateSnapshotFile(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       base::File::Error* error,
       base::File::Info* file_info,
-      base::FilePath* platform_path) OVERRIDE;
+      base::FilePath* platform_path) override;
 
   // Same as the other CreateFileEnumerator, but with recursive support.
   scoped_ptr<AbstractFileEnumerator> CreateFileEnumerator(
diff --git a/storage/browser/fileapi/plugin_private_file_system_backend.h b/storage/browser/fileapi/plugin_private_file_system_backend.h
index 248c208..09671ee 100644
--- a/storage/browser/fileapi/plugin_private_file_system_backend.h
+++ b/storage/browser/fileapi/plugin_private_file_system_backend.h
@@ -61,62 +61,62 @@ class STORAGE_EXPORT PluginPrivateFileSystemBackend
       const StatusCallback& callback);
 
   // FileSystemBackend overrides.
-  virtual bool CanHandleType(FileSystemType type) const OVERRIDE;
-  virtual void Initialize(FileSystemContext* context) OVERRIDE;
+  virtual bool CanHandleType(FileSystemType type) const override;
+  virtual void Initialize(FileSystemContext* context) override;
   virtual void ResolveURL(const FileSystemURL& url,
                           OpenFileSystemMode mode,
-                          const OpenFileSystemCallback& callback) OVERRIDE;
-  virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) OVERRIDE;
-  virtual WatcherManager* GetWatcherManager(FileSystemType type) OVERRIDE;
+                          const OpenFileSystemCallback& callback) override;
+  virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) override;
+  virtual WatcherManager* GetWatcherManager(FileSystemType type) override;
   virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
       FileSystemType type,
-      base::File::Error* error_code) OVERRIDE;
+      base::File::Error* error_code) override;
   virtual FileSystemOperation* CreateFileSystemOperation(
       const FileSystemURL& url,
       FileSystemContext* context,
-      base::File::Error* error_code) const OVERRIDE;
-  virtual bool SupportsStreaming(const FileSystemURL& url) const OVERRIDE;
+      base::File::Error* error_code) const override;
+  virtual bool SupportsStreaming(const FileSystemURL& url) const override;
   virtual bool HasInplaceCopyImplementation(
-      storage::FileSystemType type) const OVERRIDE;
+      storage::FileSystemType type) const override;
   virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader(
       const FileSystemURL& url,
       int64 offset,
       int64 max_bytes_to_read,
       const base::Time& expected_modification_time,
-      FileSystemContext* context) const OVERRIDE;
+      FileSystemContext* context) const override;
   virtual scoped_ptr<FileStreamWriter> CreateFileStreamWriter(
       const FileSystemURL& url,
       int64 offset,
-      FileSystemContext* context) const OVERRIDE;
-  virtual FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
+      FileSystemContext* context) const override;
+  virtual FileSystemQuotaUtil* GetQuotaUtil() override;
   virtual const UpdateObserverList* GetUpdateObservers(
-      FileSystemType type) const OVERRIDE;
+      FileSystemType type) const override;
   virtual const ChangeObserverList* GetChangeObservers(
-      FileSystemType type) const OVERRIDE;
+      FileSystemType type) const override;
   virtual const AccessObserverList* GetAccessObservers(
-      FileSystemType type) const OVERRIDE;
+      FileSystemType type) const override;
 
   // FileSystemQuotaUtil overrides.
   virtual base::File::Error DeleteOriginDataOnFileTaskRunner(
       FileSystemContext* context,
       storage::QuotaManagerProxy* proxy,
       const GURL& origin_url,
-      FileSystemType type) OVERRIDE;
+      FileSystemType type) override;
   virtual void GetOriginsForTypeOnFileTaskRunner(
       FileSystemType type,
-      std::set<GURL>* origins) OVERRIDE;
+      std::set<GURL>* origins) override;
   virtual void GetOriginsForHostOnFileTaskRunner(
       FileSystemType type,
       const std::string& host,
-      std::set<GURL>* origins) OVERRIDE;
+      std::set<GURL>* origins) override;
   virtual int64 GetOriginUsageOnFileTaskRunner(
       FileSystemContext* context,
       const GURL& origin_url,
-      FileSystemType type) OVERRIDE;
+      FileSystemType type) override;
   virtual scoped_refptr<QuotaReservation>
       CreateQuotaReservationOnFileTaskRunner(
           const GURL& origin_url,
-          FileSystemType type) OVERRIDE;
+          FileSystemType type) override;
 
  private:
   friend class content::PluginPrivateFileSystemBackendTest;
diff --git a/storage/browser/fileapi/quota/quota_backend_impl.h b/storage/browser/fileapi/quota/quota_backend_impl.h
index ed15157..c2d7190 100644
--- a/storage/browser/fileapi/quota/quota_backend_impl.h
+++ b/storage/browser/fileapi/quota/quota_backend_impl.h
@@ -47,21 +47,21 @@ class STORAGE_EXPORT QuotaBackendImpl
       const GURL& origin,
       FileSystemType type,
       int64 delta,
-      const ReserveQuotaCallback& callback) OVERRIDE;
+      const ReserveQuotaCallback& callback) override;
   virtual void ReleaseReservedQuota(
       const GURL& origin,
       FileSystemType type,
-      int64 size) OVERRIDE;
+      int64 size) override;
   virtual void CommitQuotaUsage(
       const GURL& origin,
       FileSystemType type,
-      int64 delta) OVERRIDE;
+      int64 delta) override;
   virtual void IncrementDirtyCount(
       const GURL& origin,
-      FileSystemType type) OVERRIDE;
+      FileSystemType type) override;
   virtual void DecrementDirtyCount(
       const GURL& origin,
-      FileSystemType type) OVERRIDE;
+      FileSystemType type) override;
 
  private:
   friend class content::QuotaBackendImplTest;
diff --git a/storage/browser/fileapi/remove_operation_delegate.h b/storage/browser/fileapi/remove_operation_delegate.h
index 436a641..fc83028 100644
--- a/storage/browser/fileapi/remove_operation_delegate.h
+++ b/storage/browser/fileapi/remove_operation_delegate.h
@@ -19,14 +19,14 @@ class RemoveOperationDelegate : public RecursiveOperationDelegate {
   virtual ~RemoveOperationDelegate();
 
   // RecursiveOperationDelegate overrides:
-  virtual void Run() OVERRIDE;
-  virtual void RunRecursively() OVERRIDE;
+  virtual void Run() override;
+  virtual void RunRecursively() override;
   virtual void ProcessFile(const FileSystemURL& url,
-                           const StatusCallback& callback) OVERRIDE;
+                           const StatusCallback& callback) override;
   virtual void ProcessDirectory(const FileSystemURL& url,
-                                const StatusCallback& callback) OVERRIDE;
+                                const StatusCallback& callback) override;
   virtual void PostProcessDirectory(const FileSystemURL& url,
-                                    const StatusCallback& callback) OVERRIDE;
+                                    const StatusCallback& callback) override;
 
  private:
   void DidTryRemoveFile(base::File::Error error);
diff --git a/storage/browser/fileapi/sandbox_file_stream_writer.h b/storage/browser/fileapi/sandbox_file_stream_writer.h
index d24e5b9..78bf2a1 100644
--- a/storage/browser/fileapi/sandbox_file_stream_writer.h
+++ b/storage/browser/fileapi/sandbox_file_stream_writer.h
@@ -34,9 +34,9 @@ class STORAGE_EXPORT_PRIVATE SandboxFileStreamWriter
 
   // FileStreamWriter overrides.
   virtual int Write(net::IOBuffer* buf, int buf_len,
-                    const net::CompletionCallback& callback) OVERRIDE;
-  virtual int Cancel(const net::CompletionCallback& callback) OVERRIDE;
-  virtual int Flush(const net::CompletionCallback& callback) OVERRIDE;
+                    const net::CompletionCallback& callback) override;
+  virtual int Cancel(const net::CompletionCallback& callback) override;
+  virtual int Flush(const net::CompletionCallback& callback) override;
 
   // Used only by tests.
   void set_default_quota(int64 quota) {
diff --git a/storage/browser/fileapi/sandbox_file_system_backend.h b/storage/browser/fileapi/sandbox_file_system_backend.h
index 9f14c12..71e0b8b 100644
--- a/storage/browser/fileapi/sandbox_file_system_backend.h
+++ b/storage/browser/fileapi/sandbox_file_system_backend.h
@@ -32,40 +32,40 @@ class STORAGE_EXPORT SandboxFileSystemBackend
   virtual ~SandboxFileSystemBackend();
 
   // FileSystemBackend overrides.
-  virtual bool CanHandleType(FileSystemType type) const OVERRIDE;
-  virtual void Initialize(FileSystemContext* context) OVERRIDE;
+  virtual bool CanHandleType(FileSystemType type) const override;
+  virtual void Initialize(FileSystemContext* context) override;
   virtual void ResolveURL(const FileSystemURL& url,
                           OpenFileSystemMode mode,
-                          const OpenFileSystemCallback& callback) OVERRIDE;
-  virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) OVERRIDE;
-  virtual WatcherManager* GetWatcherManager(FileSystemType type) OVERRIDE;
+                          const OpenFileSystemCallback& callback) override;
+  virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) override;
+  virtual WatcherManager* GetWatcherManager(FileSystemType type) override;
   virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
       FileSystemType type,
-      base::File::Error* error_code) OVERRIDE;
+      base::File::Error* error_code) override;
   virtual FileSystemOperation* CreateFileSystemOperation(
       const FileSystemURL& url,
       FileSystemContext* context,
-      base::File::Error* error_code) const OVERRIDE;
-  virtual bool SupportsStreaming(const FileSystemURL& url) const OVERRIDE;
+      base::File::Error* error_code) const override;
+  virtual bool SupportsStreaming(const FileSystemURL& url) const override;
   virtual bool HasInplaceCopyImplementation(
-      storage::FileSystemType type) const OVERRIDE;
+      storage::FileSystemType type) const override;
   virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader(
       const FileSystemURL& url,
       int64 offset,
       int64 max_bytes_to_read,
       const base::Time& expected_modification_time,
-      FileSystemContext* context) const OVERRIDE;
+      FileSystemContext* context) const override;
   virtual scoped_ptr<FileStreamWriter> CreateFileStreamWriter(
       const FileSystemURL& url,
       int64 offset,
-      FileSystemContext* context) const OVERRIDE;
-  virtual FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
+      FileSystemContext* context) const override;
+  virtual FileSystemQuotaUtil* GetQuotaUtil() override;
   virtual const UpdateObserverList* GetUpdateObservers(
-      FileSystemType type) const OVERRIDE;
+      FileSystemType type) const override;
   virtual const ChangeObserverList* GetChangeObservers(
-      FileSystemType type) const OVERRIDE;
+      FileSystemType type) const override;
   virtual const AccessObserverList* GetAccessObservers(
-      FileSystemType type) const OVERRIDE;
+      FileSystemType type) const override;
 
   // Returns an origin enumerator of this backend.
   // This method can only be called on the file thread.
diff --git a/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc b/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc
index a5b1f63..d68ba2c 100644
--- a/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc
+++ b/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc
@@ -94,11 +94,11 @@ class ObfuscatedOriginEnumerator
   }
   virtual ~ObfuscatedOriginEnumerator() {}
 
-  virtual GURL Next() OVERRIDE {
+  virtual GURL Next() override {
     return enum_->Next();
   }
 
-  virtual bool HasFileSystemType(FileSystemType type) const OVERRIDE {
+  virtual bool HasFileSystemType(FileSystemType type) const override {
     return enum_->HasTypeDirectory(
         SandboxFileSystemBackendDelegate::GetTypeString(type));
   }
diff --git a/storage/browser/fileapi/sandbox_file_system_backend_delegate.h b/storage/browser/fileapi/sandbox_file_system_backend_delegate.h
index dfb5678..c22b8fd 100644
--- a/storage/browser/fileapi/sandbox_file_system_backend_delegate.h
+++ b/storage/browser/fileapi/sandbox_file_system_backend_delegate.h
@@ -131,22 +131,22 @@ class STORAGE_EXPORT SandboxFileSystemBackendDelegate
       FileSystemContext* context,
       storage::QuotaManagerProxy* proxy,
       const GURL& origin_url,
-      FileSystemType type) OVERRIDE;
+      FileSystemType type) override;
   virtual void GetOriginsForTypeOnFileTaskRunner(
       FileSystemType type,
-      std::set<GURL>* origins) OVERRIDE;
+      std::set<GURL>* origins) override;
   virtual void GetOriginsForHostOnFileTaskRunner(
       FileSystemType type,
       const std::string& host,
-      std::set<GURL>* origins) OVERRIDE;
+      std::set<GURL>* origins) override;
   virtual int64 GetOriginUsageOnFileTaskRunner(
       FileSystemContext* context,
       const GURL& origin_url,
-      FileSystemType type) OVERRIDE;
+      FileSystemType type) override;
   virtual scoped_refptr<QuotaReservation>
       CreateQuotaReservationOnFileTaskRunner(
           const GURL& origin_url,
-          FileSystemType type) OVERRIDE;
+          FileSystemType type) override;
 
   // Adds an observer for the secified |type| of a file system, bound to
   // |task_runner|.
diff --git a/storage/browser/fileapi/sandbox_isolated_origin_database.h b/storage/browser/fileapi/sandbox_isolated_origin_database.h
index f3ee49c..4fb9f77 100644
--- a/storage/browser/fileapi/sandbox_isolated_origin_database.h
+++ b/storage/browser/fileapi/sandbox_isolated_origin_database.h
@@ -30,12 +30,12 @@ class STORAGE_EXPORT_PRIVATE SandboxIsolatedOriginDatabase
   virtual ~SandboxIsolatedOriginDatabase();
 
   // SandboxOriginDatabaseInterface overrides.
-  virtual bool HasOriginPath(const std::string& origin) OVERRIDE;
+  virtual bool HasOriginPath(const std::string& origin) override;
   virtual bool GetPathForOrigin(const std::string& origin,
-                                base::FilePath* directory) OVERRIDE;
-  virtual bool RemovePathForOrigin(const std::string& origin) OVERRIDE;
-  virtual bool ListAllOrigins(std::vector<OriginRecord>* origins) OVERRIDE;
-  virtual void DropDatabase() OVERRIDE;
+                                base::FilePath* directory) override;
+  virtual bool RemovePathForOrigin(const std::string& origin) override;
+  virtual bool ListAllOrigins(std::vector<OriginRecord>* origins) override;
+  virtual void DropDatabase() override;
 
   // TODO(kinuko): Deprecate this after a few release cycles, e.g. around M33.
   static void MigrateBackFromObsoleteOriginDatabase(
diff --git a/storage/browser/fileapi/sandbox_origin_database.h b/storage/browser/fileapi/sandbox_origin_database.h
index 21779d5..3fef8d5 100644
--- a/storage/browser/fileapi/sandbox_origin_database.h
+++ b/storage/browser/fileapi/sandbox_origin_database.h
@@ -36,12 +36,12 @@ class STORAGE_EXPORT_PRIVATE SandboxOriginDatabase
   virtual ~SandboxOriginDatabase();
 
   // SandboxOriginDatabaseInterface overrides.
-  virtual bool HasOriginPath(const std::string& origin) OVERRIDE;
+  virtual bool HasOriginPath(const std::string& origin) override;
   virtual bool GetPathForOrigin(const std::string& origin,
-                                base::FilePath* directory) OVERRIDE;
-  virtual bool RemovePathForOrigin(const std::string& origin) OVERRIDE;
-  virtual bool ListAllOrigins(std::vector<OriginRecord>* origins) OVERRIDE;
-  virtual void DropDatabase() OVERRIDE;
+                                base::FilePath* directory) override;
+  virtual bool RemovePathForOrigin(const std::string& origin) override;
+  virtual bool ListAllOrigins(std::vector<OriginRecord>* origins) override;
+  virtual void DropDatabase() override;
 
   base::FilePath GetDatabasePath() const;
   void RemoveDatabase();
diff --git a/storage/browser/fileapi/sandbox_prioritized_origin_database.h b/storage/browser/fileapi/sandbox_prioritized_origin_database.h
index bbe1420..438b0b14 100644
--- a/storage/browser/fileapi/sandbox_prioritized_origin_database.h
+++ b/storage/browser/fileapi/sandbox_prioritized_origin_database.h
@@ -36,12 +36,12 @@ class STORAGE_EXPORT_PRIVATE SandboxPrioritizedOriginDatabase
   std::string GetPrimaryOrigin();
 
   // SandboxOriginDatabaseInterface overrides.
-  virtual bool HasOriginPath(const std::string& origin) OVERRIDE;
+  virtual bool HasOriginPath(const std::string& origin) override;
   virtual bool GetPathForOrigin(const std::string& origin,
-                                base::FilePath* directory) OVERRIDE;
-  virtual bool RemovePathForOrigin(const std::string& origin) OVERRIDE;
-  virtual bool ListAllOrigins(std::vector<OriginRecord>* origins) OVERRIDE;
-  virtual void DropDatabase() OVERRIDE;
+                                base::FilePath* directory) override;
+  virtual bool RemovePathForOrigin(const std::string& origin) override;
+  virtual bool ListAllOrigins(std::vector<OriginRecord>* origins) override;
+  virtual void DropDatabase() override;
 
   const base::FilePath& primary_origin_file() const {
     return primary_origin_file_;
diff --git a/storage/browser/fileapi/sandbox_quota_observer.h b/storage/browser/fileapi/sandbox_quota_observer.h
index 4ae2cf9..3c3d619 100644
--- a/storage/browser/fileapi/sandbox_quota_observer.h
+++ b/storage/browser/fileapi/sandbox_quota_observer.h
@@ -44,12 +44,12 @@ class SandboxQuotaObserver
   virtual ~SandboxQuotaObserver();
 
   // FileUpdateObserver overrides.
-  virtual void OnStartUpdate(const FileSystemURL& url) OVERRIDE;
-  virtual void OnUpdate(const FileSystemURL& url, int64 delta) OVERRIDE;
-  virtual void OnEndUpdate(const FileSystemURL& url) OVERRIDE;
+  virtual void OnStartUpdate(const FileSystemURL& url) override;
+  virtual void OnUpdate(const FileSystemURL& url, int64 delta) override;
+  virtual void OnEndUpdate(const FileSystemURL& url) override;
 
   // FileAccessObserver overrides.
-  virtual void OnAccess(const FileSystemURL& url) OVERRIDE;
+  virtual void OnAccess(const FileSystemURL& url) override;
 
   void SetUsageCacheEnabled(const GURL& origin,
                             FileSystemType type,
diff --git a/storage/browser/fileapi/transient_file_util.h b/storage/browser/fileapi/transient_file_util.h
index 16d710e..054f8b0 100644
--- a/storage/browser/fileapi/transient_file_util.h
+++ b/storage/browser/fileapi/transient_file_util.h
@@ -25,7 +25,7 @@ class STORAGE_EXPORT_PRIVATE TransientFileUtil
       const FileSystemURL& url,
       base::File::Error* error,
       base::File::Info* file_info,
-      base::FilePath* platform_path) OVERRIDE;
+      base::FilePath* platform_path) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TransientFileUtil);
diff --git a/storage/browser/quota/quota_manager.cc b/storage/browser/quota/quota_manager.cc
index e0f3b14..0e3e7e4 100644
--- a/storage/browser/quota/quota_manager.cc
+++ b/storage/browser/quota/quota_manager.cc
@@ -420,19 +420,19 @@ class UsageAndQuotaCallbackDispatcher
     CheckCompleted();
   }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     // We initialize waiting_callbacks to 1 so that we won't run
     // the completion callback until here even some of the callbacks
     // are dispatched synchronously.
     CheckCompleted();
   }
 
-  virtual void Aborted() OVERRIDE {
+  virtual void Aborted() override {
     callback_.Run(kQuotaErrorAbort, UsageAndQuota());
     DeleteSoon();
   }
 
-  virtual void Completed() OVERRIDE {
+  virtual void Completed() override {
     DCHECK(!has_usage_ || usage_and_quota_.usage >= 0);
     DCHECK(!has_global_limited_usage_ ||
            usage_and_quota_.global_limited_usage >= 0);
@@ -474,7 +474,7 @@ class QuotaManager::GetUsageInfoTask : public QuotaTask {
   }
 
  protected:
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     remaining_trackers_ = 3;
     // This will populate cached hosts and usage info.
     manager()->GetUsageTracker(kStorageTypeTemporary)->GetGlobalUsage(
@@ -491,12 +491,12 @@ class QuotaManager::GetUsageInfoTask : public QuotaTask {
                    kStorageTypeSyncable));
   }
 
-  virtual void Completed() OVERRIDE {
+  virtual void Completed() override {
     callback_.Run(entries_);
     DeleteSoon();
   }
 
-  virtual void Aborted() OVERRIDE {
+  virtual void Aborted() override {
     callback_.Run(UsageInfoEntries());
     DeleteSoon();
   }
@@ -549,7 +549,7 @@ class QuotaManager::OriginDataDeleter : public QuotaTask {
         weak_factory_(this) {}
 
  protected:
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     error_count_ = 0;
     remaining_clients_ = manager()->clients_.size();
     for (QuotaClientList::iterator iter = manager()->clients_.begin();
@@ -567,7 +567,7 @@ class QuotaManager::OriginDataDeleter : public QuotaTask {
     }
   }
 
-  virtual void Completed() OVERRIDE {
+  virtual void Completed() override {
     if (error_count_ == 0) {
       // Only remove the entire origin if we didn't skip any client types.
       if (skipped_clients_ == 0)
@@ -579,7 +579,7 @@ class QuotaManager::OriginDataDeleter : public QuotaTask {
     DeleteSoon();
   }
 
-  virtual void Aborted() OVERRIDE {
+  virtual void Aborted() override {
     callback_.Run(kQuotaErrorAbort);
     DeleteSoon();
   }
@@ -629,7 +629,7 @@ class QuotaManager::HostDataDeleter : public QuotaTask {
         weak_factory_(this) {}
 
  protected:
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     error_count_ = 0;
     remaining_clients_ = manager()->clients_.size();
     for (QuotaClientList::iterator iter = manager()->clients_.begin();
@@ -641,7 +641,7 @@ class QuotaManager::HostDataDeleter : public QuotaTask {
     }
   }
 
-  virtual void Completed() OVERRIDE {
+  virtual void Completed() override {
     if (error_count_ == 0) {
       callback_.Run(kQuotaStatusOk);
     } else {
@@ -650,7 +650,7 @@ class QuotaManager::HostDataDeleter : public QuotaTask {
     DeleteSoon();
   }
 
-  virtual void Aborted() OVERRIDE {
+  virtual void Aborted() override {
     callback_.Run(kQuotaErrorAbort);
     DeleteSoon();
   }
diff --git a/storage/browser/quota/quota_manager.h b/storage/browser/quota/quota_manager.h
index 98a9415..c713006 100644
--- a/storage/browser/quota/quota_manager.h
+++ b/storage/browser/quota/quota_manager.h
@@ -358,13 +358,13 @@ class STORAGE_EXPORT QuotaManager
   // QuotaEvictionHandler.
   virtual void GetLRUOrigin(
       StorageType type,
-      const GetLRUOriginCallback& callback) OVERRIDE;
+      const GetLRUOriginCallback& callback) override;
   virtual void EvictOriginData(
       const GURL& origin,
       StorageType type,
-      const EvictOriginDataCallback& callback) OVERRIDE;
+      const EvictOriginDataCallback& callback) override;
   virtual void GetUsageAndQuotaForEviction(
-      const UsageAndQuotaCallback& callback) OVERRIDE;
+      const UsageAndQuotaCallback& callback) override;
 
   void DidSetTemporaryGlobalOverrideQuota(const QuotaCallback& callback,
                                           const int64* new_quota,
diff --git a/storage/browser/quota/usage_tracker.h b/storage/browser/quota/usage_tracker.h
index fda1151..02b64de 100644
--- a/storage/browser/quota/usage_tracker.h
+++ b/storage/browser/quota/usage_tracker.h
@@ -169,9 +169,9 @@ class ClientUsageTracker : public SpecialStoragePolicy::Observer,
   bool GetCachedOriginUsage(const GURL& origin, int64* usage) const;
 
   // SpecialStoragePolicy::Observer overrides
-  virtual void OnGranted(const GURL& origin, int change_flags) OVERRIDE;
-  virtual void OnRevoked(const GURL& origin, int change_flags) OVERRIDE;
-  virtual void OnCleared() OVERRIDE;
+  virtual void OnGranted(const GURL& origin, int change_flags) override;
+  virtual void OnRevoked(const GURL& origin, int change_flags) override;
+  virtual void OnCleared() override;
 
   bool IsStorageUnlimited(const GURL& origin) const;