Update from chromium https://crrev.com/302282

sandbox/linux/bpf_dsl/bpf_dsl.cc

 // Copyright 2014 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.
 
 #include "sandbox/linux/bpf_dsl/bpf_dsl.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "sandbox/linux/bpf_dsl/bpf_dsl_impl.h"
 #include "sandbox/linux/bpf_dsl/policy_compiler.h"
 #include "sandbox/linux/seccomp-bpf/errorcode.h"
 
 namespace sandbox {
 namespace bpf_dsl {
 namespace {
 
 class AllowResultExprImpl : public internal::ResultExprImpl {
  public:
   AllowResultExprImpl() {}
 
-  virtual ErrorCode Compile(PolicyCompiler* pc) const override {
+  ErrorCode Compile(PolicyCompiler* pc) const override {
     return ErrorCode(ErrorCode::ERR_ALLOWED);
   }
 
  private:
-  virtual ~AllowResultExprImpl() {}
+  ~AllowResultExprImpl() override {}
 
   DISALLOW_COPY_AND_ASSIGN(AllowResultExprImpl);
 };
 
 class ErrorResultExprImpl : public internal::ResultExprImpl {
  public:
   explicit ErrorResultExprImpl(int err) : err_(err) {
     CHECK(err_ >= ErrorCode::ERR_MIN_ERRNO && err_ <= ErrorCode::ERR_MAX_ERRNO);
   }
 
-  virtual ErrorCode Compile(PolicyCompiler* pc) const override {
+  ErrorCode Compile(PolicyCompiler* pc) const override {
     return pc->Error(err_);
   }
 
  private:
-  virtual ~ErrorResultExprImpl() {}
+  ~ErrorResultExprImpl() override {}
 
   int err_;
 
   DISALLOW_COPY_AND_ASSIGN(ErrorResultExprImpl);
 };
 
 class KillResultExprImpl : public internal::ResultExprImpl {
  public:
   explicit KillResultExprImpl(const char* msg) : msg_(msg) { DCHECK(msg_); }
 
-  virtual ErrorCode Compile(PolicyCompiler* pc) const override {
+  ErrorCode Compile(PolicyCompiler* pc) const override {
     return pc->Kill(msg_);
   }
 
  private:
-  virtual ~KillResultExprImpl() {}
+  ~KillResultExprImpl() override {}
 
   const char* msg_;
 
   DISALLOW_COPY_AND_ASSIGN(KillResultExprImpl);
 };
 
 class TraceResultExprImpl : public internal::ResultExprImpl {
  public:
   TraceResultExprImpl(uint16_t aux) : aux_(aux) {}
 
-  virtual ErrorCode Compile(PolicyCompiler* pc) const override {
+  ErrorCode Compile(PolicyCompiler* pc) const override {
     return ErrorCode(ErrorCode::ERR_TRACE + aux_);
   }
 
  private:
-  virtual ~TraceResultExprImpl() {}
+  ~TraceResultExprImpl() override {}
 
   uint16_t aux_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceResultExprImpl);
 };
 
 class TrapResultExprImpl : public internal::ResultExprImpl {
  public:
   TrapResultExprImpl(TrapRegistry::TrapFnc func, const void* arg)
       : func_(func), arg_(arg) {
     DCHECK(func_);
   }
 
-  virtual ErrorCode Compile(PolicyCompiler* pc) const override {
+  ErrorCode Compile(PolicyCompiler* pc) const override {
     return pc->Trap(func_, arg_);
   }
 
  private:
-  virtual ~TrapResultExprImpl() {}
+  ~TrapResultExprImpl() override {}
 
   TrapRegistry::TrapFnc func_;
   const void* arg_;
 
   DISALLOW_COPY_AND_ASSIGN(TrapResultExprImpl);
 };
 
 class UnsafeTrapResultExprImpl : public internal::ResultExprImpl {
  public:
   UnsafeTrapResultExprImpl(TrapRegistry::TrapFnc func, const void* arg)
       : func_(func), arg_(arg) {
     DCHECK(func_);
   }
 
-  virtual ErrorCode Compile(PolicyCompiler* pc) const override {
+  ErrorCode Compile(PolicyCompiler* pc) const override {
     return pc->UnsafeTrap(func_, arg_);
   }
 
-  virtual bool HasUnsafeTraps() const override { return true; }
+  bool HasUnsafeTraps() const override { return true; }
 
  private:
-  virtual ~UnsafeTrapResultExprImpl() {}
+  ~UnsafeTrapResultExprImpl() override {}
 
   TrapRegistry::TrapFnc func_;
   const void* arg_;
 
   DISALLOW_COPY_AND_ASSIGN(UnsafeTrapResultExprImpl);
 };
 
 class IfThenResultExprImpl : public internal::ResultExprImpl {
  public:
   IfThenResultExprImpl(const BoolExpr& cond,
                        const ResultExpr& then_result,
                        const ResultExpr& else_result)
       : cond_(cond), then_result_(then_result), else_result_(else_result) {}
 
-  virtual ErrorCode Compile(PolicyCompiler* pc) const override {
+  ErrorCode Compile(PolicyCompiler* pc) const override {
     return cond_->Compile(
         pc, then_result_->Compile(pc), else_result_->Compile(pc));
   }
 
-  virtual bool HasUnsafeTraps() const override {
+  bool HasUnsafeTraps() const override {
     return then_result_->HasUnsafeTraps() || else_result_->HasUnsafeTraps();
   }
 
  private:
-  virtual ~IfThenResultExprImpl() {}
+  ~IfThenResultExprImpl() override {}
 
   BoolExpr cond_;
   ResultExpr then_result_;
   ResultExpr else_result_;
 
   DISALLOW_COPY_AND_ASSIGN(IfThenResultExprImpl);
 };
 
 class ConstBoolExprImpl : public internal::BoolExprImpl {
  public:
   ConstBoolExprImpl(bool value) : value_(value) {}
 
-  virtual ErrorCode Compile(PolicyCompiler* pc,
-                            ErrorCode true_ec,
-                            ErrorCode false_ec) const override {
+  ErrorCode Compile(PolicyCompiler* pc,
+                    ErrorCode true_ec,
+                    ErrorCode false_ec) const override {
     return value_ ? true_ec : false_ec;
   }
 
  private:
-  virtual ~ConstBoolExprImpl() {}
+  ~ConstBoolExprImpl() override {}
 
   bool value_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstBoolExprImpl);
 };
 
 class PrimitiveBoolExprImpl : public internal::BoolExprImpl {
  public:
   PrimitiveBoolExprImpl(int argno,
                         ErrorCode::ArgType is_32bit,
                         uint64_t mask,
                         uint64_t value)
       : argno_(argno), is_32bit_(is_32bit), mask_(mask), value_(value) {}
 
-  virtual ErrorCode Compile(PolicyCompiler* pc,
-                            ErrorCode true_ec,
-                            ErrorCode false_ec) const override {
+  ErrorCode Compile(PolicyCompiler* pc,
+                    ErrorCode true_ec,
+                    ErrorCode false_ec) const override {
     return pc->CondMaskedEqual(
         argno_, is_32bit_, mask_, value_, true_ec, false_ec);
   }
 
  private:
-  virtual ~PrimitiveBoolExprImpl() {}
+  ~PrimitiveBoolExprImpl() override {}
 
   int argno_;
   ErrorCode::ArgType is_32bit_;
   uint64_t mask_;
   uint64_t value_;
 
   DISALLOW_COPY_AND_ASSIGN(PrimitiveBoolExprImpl);
 };
 
 class NegateBoolExprImpl : public internal::BoolExprImpl {
  public:
   explicit NegateBoolExprImpl(const BoolExpr& cond) : cond_(cond) {}
 
-  virtual ErrorCode Compile(PolicyCompiler* pc,
-                            ErrorCode true_ec,
-                            ErrorCode false_ec) const override {
+  ErrorCode Compile(PolicyCompiler* pc,
+                    ErrorCode true_ec,
+                    ErrorCode false_ec) const override {
     return cond_->Compile(pc, false_ec, true_ec);
   }
 
  private:
-  virtual ~NegateBoolExprImpl() {}
+  ~NegateBoolExprImpl() override {}
 
   BoolExpr cond_;
 
   DISALLOW_COPY_AND_ASSIGN(NegateBoolExprImpl);
 };
 
 class AndBoolExprImpl : public internal::BoolExprImpl {
  public:
   AndBoolExprImpl(const BoolExpr& lhs, const BoolExpr& rhs)
       : lhs_(lhs), rhs_(rhs) {}
 
-  virtual ErrorCode Compile(PolicyCompiler* pc,
-                            ErrorCode true_ec,
-                            ErrorCode false_ec) const override {
+  ErrorCode Compile(PolicyCompiler* pc,
+                    ErrorCode true_ec,
+                    ErrorCode false_ec) const override {
     return lhs_->Compile(pc, rhs_->Compile(pc, true_ec, false_ec), false_ec);
   }
 
  private:
-  virtual ~AndBoolExprImpl() {}
+  ~AndBoolExprImpl() override {}
 
   BoolExpr lhs_;
   BoolExpr rhs_;
 
   DISALLOW_COPY_AND_ASSIGN(AndBoolExprImpl);
 };
 
 class OrBoolExprImpl : public internal::BoolExprImpl {
  public:
   OrBoolExprImpl(const BoolExpr& lhs, const BoolExpr& rhs)
       : lhs_(lhs), rhs_(rhs) {}
 
-  virtual ErrorCode Compile(PolicyCompiler* pc,
-                            ErrorCode true_ec,
-                            ErrorCode false_ec) const override {
+  ErrorCode Compile(PolicyCompiler* pc,
+                    ErrorCode true_ec,
+                    ErrorCode false_ec) const override {
     return lhs_->Compile(pc, true_ec, rhs_->Compile(pc, true_ec, false_ec));
   }
 
  private:
-  virtual ~OrBoolExprImpl() {}
+  ~OrBoolExprImpl() override {}
 
   BoolExpr lhs_;
   BoolExpr rhs_;
 
   DISALLOW_COPY_AND_ASSIGN(OrBoolExprImpl);
 };
 
 }  // namespace
 
 namespace internal {
@@ skipping 112 matching lines @@
         new const IfThenResultExprImpl(clause.first, clause.second, expr));
   }
   return expr;
 }
 
 }  // namespace bpf_dsl
 }  // namespace sandbox
 
 template class scoped_refptr<const sandbox::bpf_dsl::internal::BoolExprImpl>;
 template class scoped_refptr<const sandbox::bpf_dsl::internal::ResultExprImpl>;