Update from https://crrev.com/309415

base/bind_internal.h

 // This file was GENERATED by command:
 //     pump.py bind_internal.h.pump
 // DO NOT EDIT BY HAND!!!
 
 
 // Copyright (c) 2011 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 BASE_BIND_INTERNAL_H_
@@ skipping 1832 matching lines @@
 template <typename Runnable, typename RunType>
 struct BindState<Runnable, RunType, void()> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef false_type IsWeakCall;
   typedef Invoker<0, BindState, RunType> InvokerType;
   typedef typename InvokerType::UnboundRunType UnboundRunType;
   explicit BindState(const Runnable& runnable)
       : runnable_(runnable) {
   }
 
-  virtual ~BindState() {  }
+  RunnableType runnable_;
 
-  RunnableType runnable_;
+ private:
+  ~BindState() override {  }
+
 };
 
 template <typename Runnable, typename RunType, typename P1>
 struct BindState<Runnable, RunType, void(P1)> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
   typedef Invoker<1, BindState, RunType> InvokerType;
   typedef typename InvokerType::UnboundRunType UnboundRunType;
 
   // Convenience typedefs for bound argument types.
   typedef UnwrapTraits<P1> Bound1UnwrapTraits;
 
   BindState(const Runnable& runnable, const P1& p1)
       : runnable_(runnable),
         p1_(p1) {
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  virtual ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
+  RunnableType runnable_;
+  P1 p1_;
+
+ private:
+  ~BindState() override {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
       P1>::Release(p1_);  }
 
-  RunnableType runnable_;
-  P1 p1_;
 };
 
 template <typename Runnable, typename RunType, typename P1, typename P2>
 struct BindState<Runnable, RunType, void(P1, P2)> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
   typedef Invoker<2, BindState, RunType> InvokerType;
   typedef typename InvokerType::UnboundRunType UnboundRunType;
 
   // Convenience typedefs for bound argument types.
   typedef UnwrapTraits<P1> Bound1UnwrapTraits;
   typedef UnwrapTraits<P2> Bound2UnwrapTraits;
 
   BindState(const Runnable& runnable, const P1& p1, const P2& p2)
       : runnable_(runnable),
         p1_(p1),
         p2_(p2) {
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  virtual ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
-
   RunnableType runnable_;
   P1 p1_;
   P2 p2_;
+
+ private:
+  ~BindState() override {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
+      P1>::Release(p1_);  }
+
 };
 
 template <typename Runnable, typename RunType, typename P1, typename P2,
     typename P3>
 struct BindState<Runnable, RunType, void(P1, P2, P3)> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
   typedef Invoker<3, BindState, RunType> InvokerType;
   typedef typename InvokerType::UnboundRunType UnboundRunType;
 
   // Convenience typedefs for bound argument types.
   typedef UnwrapTraits<P1> Bound1UnwrapTraits;
   typedef UnwrapTraits<P2> Bound2UnwrapTraits;
   typedef UnwrapTraits<P3> Bound3UnwrapTraits;
 
   BindState(const Runnable& runnable, const P1& p1, const P2& p2, const P3& p3)
       : runnable_(runnable),
         p1_(p1),
         p2_(p2),
         p3_(p3) {
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  virtual ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
-
   RunnableType runnable_;
   P1 p1_;
   P2 p2_;
   P3 p3_;
+
+ private:
+  ~BindState() override {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
+      P1>::Release(p1_);  }
+
 };
 
 template <typename Runnable, typename RunType, typename P1, typename P2,
     typename P3, typename P4>
 struct BindState<Runnable, RunType, void(P1, P2, P3,
     P4)> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
   typedef Invoker<4, BindState, RunType> InvokerType;
   typedef typename InvokerType::UnboundRunType UnboundRunType;
 
   // Convenience typedefs for bound argument types.
   typedef UnwrapTraits<P1> Bound1UnwrapTraits;
   typedef UnwrapTraits<P2> Bound2UnwrapTraits;
   typedef UnwrapTraits<P3> Bound3UnwrapTraits;
   typedef UnwrapTraits<P4> Bound4UnwrapTraits;
 
   BindState(const Runnable& runnable, const P1& p1, const P2& p2, const P3& p3,
       const P4& p4)
       : runnable_(runnable),
         p1_(p1),
         p2_(p2),
         p3_(p3),
         p4_(p4) {
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  virtual ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
-
   RunnableType runnable_;
   P1 p1_;
   P2 p2_;
   P3 p3_;
   P4 p4_;
+
+ private:
+  ~BindState() override {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
+      P1>::Release(p1_);  }
+
 };
 
 template <typename Runnable, typename RunType, typename P1, typename P2,
     typename P3, typename P4, typename P5>
 struct BindState<Runnable, RunType, void(P1, P2, P3, P4,
     P5)> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
   typedef Invoker<5, BindState, RunType> InvokerType;
   typedef typename InvokerType::UnboundRunType UnboundRunType;
 
   // Convenience typedefs for bound argument types.
   typedef UnwrapTraits<P1> Bound1UnwrapTraits;
   typedef UnwrapTraits<P2> Bound2UnwrapTraits;
   typedef UnwrapTraits<P3> Bound3UnwrapTraits;
   typedef UnwrapTraits<P4> Bound4UnwrapTraits;
   typedef UnwrapTraits<P5> Bound5UnwrapTraits;
 
   BindState(const Runnable& runnable, const P1& p1, const P2& p2, const P3& p3,
       const P4& p4, const P5& p5)
       : runnable_(runnable),
         p1_(p1),
         p2_(p2),
         p3_(p3),
         p4_(p4),
         p5_(p5) {
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  virtual ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
-
   RunnableType runnable_;
   P1 p1_;
   P2 p2_;
   P3 p3_;
   P4 p4_;
   P5 p5_;
+
+ private:
+  ~BindState() override {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
+      P1>::Release(p1_);  }
+
 };
 
 template <typename Runnable, typename RunType, typename P1, typename P2,
     typename P3, typename P4, typename P5, typename P6>
 struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5,
     P6)> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
   typedef Invoker<6, BindState, RunType> InvokerType;
   typedef typename InvokerType::UnboundRunType UnboundRunType;
@@ skipping 11 matching lines @@
       : runnable_(runnable),
         p1_(p1),
         p2_(p2),
         p3_(p3),
         p4_(p4),
         p5_(p5),
         p6_(p6) {
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  virtual ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
-
   RunnableType runnable_;
   P1 p1_;
   P2 p2_;
   P3 p3_;
   P4 p4_;
   P5 p5_;
   P6 p6_;
+
+ private:
+  ~BindState() override {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
+      P1>::Release(p1_);  }
+
 };
 
 template <typename Runnable, typename RunType, typename P1, typename P2,
     typename P3, typename P4, typename P5, typename P6, typename P7>
 struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6,
     P7)> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
   typedef Invoker<7, BindState, RunType> InvokerType;
   typedef typename InvokerType::UnboundRunType UnboundRunType;
@@ skipping 13 matching lines @@
         p1_(p1),
         p2_(p2),
         p3_(p3),
         p4_(p4),
         p5_(p5),
         p6_(p6),
         p7_(p7) {
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  virtual ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
-
   RunnableType runnable_;
   P1 p1_;
   P2 p2_;
   P3 p3_;
   P4 p4_;
   P5 p5_;
   P6 p6_;
   P7 p7_;
+
+ private:
+  ~BindState() override {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
+      P1>::Release(p1_);  }
+
 };
 
 }  // namespace internal
 }  // namespace base
 
 #endif  // BASE_BIND_INTERNAL_H_