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);