commit e2ac7e8b68fc01e88f0c062120e8147b0ba6da0a
author James Robinson <jamesr@chromium.org> Wed Oct 15 13:21:59 2014 -0700
committer James Robinson <jamesr@chromium.org> Wed Oct 15 13:21:59 2014 -0700
tree 9b3c302146e3b9766cf7c2583513417b0ade23fb
parent d5ac37c9367f06d66e18ef47849e6681d25c7807

Revved to chromium 4dfb55c9cf0950b8bac8b10070c9b8f3e7de66c2 refs/remotes/origin/HEAD

gin/modules/module_registry_unittest.cc

diff --git a/gin/modules/module_registry_unittest.cc b/gin/modules/module_registry_unittest.cc
index 77bf9f1..57bc02d 100644
--- a/gin/modules/module_registry_unittest.cc
+++ b/gin/modules/module_registry_unittest.cc
@@ -37,7 +37,7 @@
 
   virtual void OnDidAddPendingModule(
       const std::string& id,
-      const std::vector<std::string>& dependencies) OVERRIDE {
+      const std::vector<std::string>& dependencies) override {
     did_add_count_++;
     id_ = id;
     dependencies_ = dependencies;

gin/modules/module_runner_delegate.h

diff --git a/gin/modules/module_runner_delegate.h b/gin/modules/module_runner_delegate.h
index df91f63..421e23a 100644
--- a/gin/modules/module_runner_delegate.h
+++ b/gin/modules/module_runner_delegate.h
@@ -41,9 +41,9 @@
   // From ShellRunnerDelegate:
   virtual v8::Handle<v8::ObjectTemplate> GetGlobalTemplate(
       ShellRunner* runner,
-      v8::Isolate* isolate) OVERRIDE;
-  virtual void DidCreateContext(ShellRunner* runner) OVERRIDE;
-  virtual void DidRunScript(ShellRunner* runner) OVERRIDE;
+      v8::Isolate* isolate) override;
+  virtual void DidCreateContext(ShellRunner* runner) override;
+  virtual void DidRunScript(ShellRunner* runner) override;
 
   BuiltinModuleMap builtin_modules_;
   FileModuleProvider module_provider_;

gin/modules/timer.h

diff --git a/gin/modules/timer.h b/gin/modules/timer.h
index 1ec0b93..6284668 100644
--- a/gin/modules/timer.h
+++ b/gin/modules/timer.h
@@ -30,7 +30,7 @@
                               int delay_ms, v8::Handle<v8::Function> function);
 
   virtual ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) OVERRIDE;
+      v8::Isolate* isolate) override;
 
  private:
   Timer(v8::Isolate* isolate, bool repeating, int delay_ms,
@@ -58,7 +58,7 @@
   virtual ~TimerModule();
 
   virtual ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) OVERRIDE;
+      v8::Isolate* isolate) override;
 };
 
 }  // namespace gin

gin/modules/timer_unittest.cc

diff --git a/gin/modules/timer_unittest.cc b/gin/modules/timer_unittest.cc
index f7fd8f2..42d7050 100644
--- a/gin/modules/timer_unittest.cc
+++ b/gin/modules/timer_unittest.cc
@@ -41,7 +41,7 @@
   }
 
   virtual ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) OVERRIDE {
+      v8::Isolate* isolate) override {
     return Wrappable<Result>::GetObjectTemplateBuilder(isolate)
         .SetProperty("count", &Result::count, &Result::set_count)
         .SetMethod("quit", &Result::Quit);

gin/public/v8_platform.h

diff --git a/gin/public/v8_platform.h b/gin/public/v8_platform.h
index f085b58..59e2147 100644
--- a/gin/public/v8_platform.h
+++ b/gin/public/v8_platform.h
@@ -21,10 +21,10 @@
   // v8::Platform implementation.
   virtual void CallOnBackgroundThread(
       v8::Task* task,
-      v8::Platform::ExpectedRuntime expected_runtime) OVERRIDE;
+      v8::Platform::ExpectedRuntime expected_runtime) override;
   virtual void CallOnForegroundThread(v8::Isolate* isolate,
-                                      v8::Task* task) OVERRIDE;
-  virtual double MonotonicallyIncreasingTime() OVERRIDE;
+                                      v8::Task* task) override;
+  virtual double MonotonicallyIncreasingTime() override;
  private:
   friend struct base::DefaultLazyInstanceTraits<V8Platform>;
 

gin/shell/gin_main.cc

diff --git a/gin/shell/gin_main.cc b/gin/shell/gin_main.cc
index aa9f2b5..77b167a 100644
--- a/gin/shell/gin_main.cc
+++ b/gin/shell/gin_main.cc
@@ -45,7 +45,7 @@
   }
 
   virtual void UnhandledException(ShellRunner* runner,
-                                  TryCatch& try_catch) OVERRIDE {
+                                  TryCatch& try_catch) override {
     ModuleRunnerDelegate::UnhandledException(runner, try_catch);
     LOG(ERROR) << try_catch.GetStackTrace();
   }

gin/test/file_runner.h

diff --git a/gin/test/file_runner.h b/gin/test/file_runner.h
index f248fb5..5082cd5 100644
--- a/gin/test/file_runner.h
+++ b/gin/test/file_runner.h
@@ -25,7 +25,7 @@
  private:
   // From ModuleRunnerDelegate:
   virtual void UnhandledException(ShellRunner* runner,
-                                  TryCatch& try_catch) OVERRIDE;
+                                  TryCatch& try_catch) override;
 
   DISALLOW_COPY_AND_ASSIGN(FileRunnerDelegate);
 };

gin/test/v8_test.h

diff --git a/gin/test/v8_test.h b/gin/test/v8_test.h
index e62aa57..39ed4e9 100644
--- a/gin/test/v8_test.h
+++ b/gin/test/v8_test.h
@@ -22,8 +22,8 @@
   V8Test();
   virtual ~V8Test();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   scoped_ptr<IsolateHolder> instance_;