9 files changed, 19 insertions, 19 deletions
diff --git a/remoting/base/auto_thread.h b/remoting/base/auto_thread.h
index 82dbfe9..ece3685 100644
--- a/remoting/base/auto_thread.h
+++ b/remoting/base/auto_thread.h
@@ -83,7 +83,7 @@ class AutoThread : base::PlatformThread::Delegate {
   void JoinAndDeleteThread();
 
   // base::PlatformThread::Delegate methods:
-  virtual void ThreadMain() OVERRIDE;
+  virtual void ThreadMain() override;
 
   // Used to pass data to ThreadMain.
   struct StartupData;
diff --git a/remoting/base/auto_thread_task_runner.h b/remoting/base/auto_thread_task_runner.h
index bdd59fb..7c40539 100644
--- a/remoting/base/auto_thread_task_runner.h
+++ b/remoting/base/auto_thread_task_runner.h
@@ -28,12 +28,12 @@ class AutoThreadTaskRunner : public base::SingleThreadTaskRunner {
   virtual bool PostDelayedTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
-      base::TimeDelta delay) OVERRIDE;
+      base::TimeDelta delay) override;
   virtual bool PostNonNestableDelayedTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
-      base::TimeDelta delay) OVERRIDE;
-  virtual bool RunsTasksOnCurrentThread() const OVERRIDE;
+      base::TimeDelta delay) override;
+  virtual bool RunsTasksOnCurrentThread() const override;
 
  private:
   virtual ~AutoThreadTaskRunner();
diff --git a/remoting/base/auto_thread_unittest.cc b/remoting/base/auto_thread_unittest.cc
index f25f235..1e14cfa 100644
--- a/remoting/base/auto_thread_unittest.cc
+++ b/remoting/base/auto_thread_unittest.cc
@@ -72,14 +72,14 @@ class AutoThreadTest : public testing::Test {
     message_loop_.Run();
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     main_task_runner_ = new AutoThreadTaskRunner(
         message_loop_.message_loop_proxy(),
         base::Bind(&AutoThreadTest::QuitMainMessageLoop,
                    base::Unretained(this)));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Verify that |message_loop_| was quit by the AutoThreadTaskRunner.
     EXPECT_TRUE(message_loop_quit_correctly_);
   }
diff --git a/remoting/base/breakpad_win_unittest.cc b/remoting/base/breakpad_win_unittest.cc
index 9f93f78..da554b2 100644
--- a/remoting/base/breakpad_win_unittest.cc
+++ b/remoting/base/breakpad_win_unittest.cc
@@ -71,7 +71,7 @@ class BreakpadWinDeathTest : public testing::Test {
   BreakpadWinDeathTest();
   virtual ~BreakpadWinDeathTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
  protected:
   scoped_ptr<google_breakpad::CrashGenerationServer> crash_server_;
diff --git a/remoting/base/compound_buffer.h b/remoting/base/compound_buffer.h
index 227f5fa..c919f88 100644
--- a/remoting/base/compound_buffer.h
+++ b/remoting/base/compound_buffer.h
@@ -108,10 +108,10 @@ class CompoundBufferInputStream
   int position() const { return position_; }
 
   // google::protobuf::io::ZeroCopyInputStream interface.
-  virtual bool Next(const void** data, int* size) OVERRIDE;
-  virtual void BackUp(int count) OVERRIDE;
-  virtual bool Skip(int count) OVERRIDE;
-  virtual int64 ByteCount() const OVERRIDE;
+  virtual bool Next(const void** data, int* size) override;
+  virtual void BackUp(int count) override;
+  virtual bool Skip(int count) override;
+  virtual int64 ByteCount() const override;
 
  private:
   const CompoundBuffer* buffer_;
diff --git a/remoting/base/plugin_thread_task_runner.h b/remoting/base/plugin_thread_task_runner.h
index 0439345..53830ce 100644
--- a/remoting/base/plugin_thread_task_runner.h
+++ b/remoting/base/plugin_thread_task_runner.h
@@ -49,12 +49,12 @@ class PluginThreadTaskRunner : public base::SingleThreadTaskRunner {
   virtual bool PostDelayedTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
-      base::TimeDelta delay) OVERRIDE;
+      base::TimeDelta delay) override;
   virtual bool PostNonNestableDelayedTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
-      base::TimeDelta delay) OVERRIDE;
-  virtual bool RunsTasksOnCurrentThread() const OVERRIDE;
+      base::TimeDelta delay) override;
+  virtual bool RunsTasksOnCurrentThread() const override;
 
  protected:
   virtual ~PluginThreadTaskRunner();
diff --git a/remoting/base/resources_unittest.cc b/remoting/base/resources_unittest.cc
index 6511967..65b4468 100644
--- a/remoting/base/resources_unittest.cc
+++ b/remoting/base/resources_unittest.cc
@@ -15,11 +15,11 @@ class ResourcesTest : public testing::Test {
   ResourcesTest(): resources_available_(false) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     resources_available_ = LoadResources("en-US");
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     UnloadResources();
   }
 
diff --git a/remoting/base/url_request_context_getter.h b/remoting/base/url_request_context_getter.h
index 2cdc8de..d35b021 100644
--- a/remoting/base/url_request_context_getter.h
+++ b/remoting/base/url_request_context_getter.h
@@ -26,9 +26,9 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
       scoped_refptr<base::SingleThreadTaskRunner> file_task_runner);
 
   // Overridden from net::URLRequestContextGetter:
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
+  virtual net::URLRequestContext* GetURLRequestContext() override;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const OVERRIDE;
+      GetNetworkTaskRunner() const override;
 
  protected:
   virtual ~URLRequestContextGetter();
diff --git a/remoting/base/vlog_net_log.cc b/remoting/base/vlog_net_log.cc
index aee63b8..086fe33 100644
--- a/remoting/base/vlog_net_log.cc
+++ b/remoting/base/vlog_net_log.cc
@@ -19,7 +19,7 @@ class VlogNetLog::Observer : public net::NetLog::ThreadSafeObserver {
   virtual ~Observer();
 
   // NetLog::ThreadSafeObserver overrides:
-  virtual void OnAddEntry(const net::NetLog::Entry& entry) OVERRIDE;
+  virtual void OnAddEntry(const net::NetLog::Entry& entry) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Observer);