replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]*

chrome/browser/sync_file_system/drive_backend/conflict_resolver.h

 // Copyright 2013 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_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 24 matching lines @@
 // ConflictResolver detaches the file from all parents other than the parent
 // of the active tracker.
 // If multiple trackers have the same local path or the same remote file,
 // ConflictResolver picks up one of them and delete others.
 class ConflictResolver : public SyncTask {
  public:
   typedef std::vector<std::string> FileIDList;
 
   explicit ConflictResolver(SyncEngineContext* sync_context);
   virtual ~ConflictResolver();
-  virtual void RunPreflight(scoped_ptr<SyncTaskToken> token) OVERRIDE;
+  virtual void RunPreflight(scoped_ptr<SyncTaskToken> token) override;
   void RunExclusive(scoped_ptr<SyncTaskToken> token);
 
  private:
   typedef std::pair<std::string, std::string> FileIDAndETag;
 
   void DetachFromNonPrimaryParents(scoped_ptr<SyncTaskToken> token);
   void DidDetachFromParent(scoped_ptr<SyncTaskToken> token,
                            google_apis::GDataErrorCode error);
 
   std::string PickPrimaryFile(const TrackerIDSet& trackers);
@@ skipping 23 matching lines @@
 
   base::WeakPtrFactory<ConflictResolver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
 };
 
 }  // namespace drive_backend
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_