BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 33 insertions, 28 deletions

diff --git a/chromium/content/browser/accessibility/browser_accessibility_manager_unittest.cc b/chromium/content/browser/accessibility/browser_accessibility_manager_unittest.cc
index ddff85fd804..8e2e3d033b9 100644
--- a/chromium/content/browser/accessibility/browser_accessibility_manager_unittest.cc
+++ b/chromium/content/browser/accessibility/browser_accessibility_manager_unittest.cc
@@ -22,15 +22,11 @@ class CountedBrowserAccessibility : public BrowserAccessibility {
     global_obj_count_++;
     native_ref_count_ = 1;
   }
-  virtual ~CountedBrowserAccessibility() {
-    global_obj_count_--;
-  }
+  ~CountedBrowserAccessibility() override { global_obj_count_--; }
 
-  virtual void NativeAddReference() OVERRIDE {
-    native_ref_count_++;
-  }
+  void NativeAddReference() override { native_ref_count_++; }
 
-  virtual void NativeReleaseReference() OVERRIDE {
+  void NativeReleaseReference() override {
     native_ref_count_--;
     if (native_ref_count_ == 0)
       delete this;
@@ -55,8 +51,8 @@ int CountedBrowserAccessibility::global_obj_count_ = 0;
 class CountedBrowserAccessibilityFactory
     : public BrowserAccessibilityFactory {
  public:
-  virtual ~CountedBrowserAccessibilityFactory() {}
-  virtual BrowserAccessibility* Create() OVERRIDE {
+  ~CountedBrowserAccessibilityFactory() override {}
+  BrowserAccessibility* Create() override {
     return new CountedBrowserAccessibility();
   }
 };
@@ -67,29 +63,38 @@ class TestBrowserAccessibilityDelegate
   TestBrowserAccessibilityDelegate()
       : got_fatal_error_(false) {}
 
-  virtual void AccessibilitySetFocus(int acc_obj_id) OVERRIDE {}
-  virtual void AccessibilityDoDefaultAction(int acc_obj_id) OVERRIDE {}
-  virtual void AccessibilityShowMenu(int acc_obj_id) OVERRIDE {}
-  virtual void AccessibilityScrollToMakeVisible(
-      int acc_obj_id, gfx::Rect subfocus) OVERRIDE {}
-  virtual void AccessibilityScrollToPoint(
-      int acc_obj_id, gfx::Point point) OVERRIDE {}
-  virtual void AccessibilitySetTextSelection(
-      int acc_obj_id, int start_offset, int end_offset) OVERRIDE {}
-  virtual bool AccessibilityViewHasFocus() const OVERRIDE {
-    return false;
+  void AccessibilitySetFocus(int acc_obj_id) override {}
+  void AccessibilityDoDefaultAction(int acc_obj_id) override {}
+  void AccessibilityShowMenu(const gfx::Point& point) override {}
+  void AccessibilityScrollToMakeVisible(int acc_obj_id,
+                                        const gfx::Rect& subfocus) override {}
+  void AccessibilityScrollToPoint(int acc_obj_id,
+                                  const gfx::Point& point) override {}
+  void AccessibilitySetTextSelection(int acc_obj_id,
+                                     int start_offset,
+                                     int end_offset) override {}
+  void AccessibilitySetValue(int acc_obj_id, const base::string16& value)
+      override {}
+  bool AccessibilityViewHasFocus() const override { return false; }
+  gfx::Rect AccessibilityGetViewBounds() const override { return gfx::Rect(); }
+  gfx::Point AccessibilityOriginInScreen(
+      const gfx::Rect& bounds) const override {
+    return gfx::Point();
   }
-  virtual gfx::Rect AccessibilityGetViewBounds() const OVERRIDE {
-    return gfx::Rect();
+  void AccessibilityHitTest(const gfx::Point& point) override {}
+  void AccessibilitySetAccessibilityFocus(int acc_obj_id) override {}
+  void AccessibilityFatalError() override { got_fatal_error_ = true; }
+  gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override {
+    return gfx::kNullAcceleratedWidget;
   }
-  virtual gfx::Point AccessibilityOriginInScreen(
-      const gfx::Rect& bounds) const OVERRIDE {
-    return gfx::Point();
+  gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override {
+    return NULL;
   }
-  virtual void AccessibilityHitTest(const gfx::Point& point) OVERRIDE {}
-  virtual void AccessibilityFatalError() OVERRIDE {
-    got_fatal_error_ = true;
+  BrowserAccessibilityManager* AccessibilityGetChildFrame(
+      int accessibility_node_id) override {
+    return NULL;
   }
+  BrowserAccessibility* AccessibilityGetParentFrame() override { return NULL; }
 
   bool got_fatal_error() const { return got_fatal_error_; }
   void reset_got_fatal_error() { got_fatal_error_ = false; }