Update from https://crrev.com/309717

sandbox/linux/seccomp-bpf/codegen.h

 // Copyright (c) 2012 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 SANDBOX_LINUX_SECCOMP_BPF_CODEGEN_H__
 #define SANDBOX_LINUX_SECCOMP_BPF_CODEGEN_H__
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 63 matching lines @@
   Node MakeInstruction(uint16_t code,
                        uint32_t k,
                        Node jt = kNullNode,
                        Node jf = kNullNode);
 
   // Compile linearizes the instruction DAG rooted at |head| into a
   // program that can be executed by a BPF virtual machine.
   void Compile(Node head, Program* program);
 
  private:
-  using MemoKey = Tuple4<uint16_t, uint32_t, Node, Node>;
+  using MemoKey = Tuple<uint16_t, uint32_t, Node, Node>;
   struct MemoKeyLess {
     bool operator()(const MemoKey& lhs, const MemoKey& rhs) const;
   };
 
   // AppendInstruction adds a new instruction, ensuring that |jt| and
   // |jf| are within range as necessary for |code|.
   Node AppendInstruction(uint16_t code, uint32_t k, Node jt, Node jf);
 
   // WithinRange returns a node equivalent to |next| that is at most
   // |range| instructions away from the (logical) beginning of the
@@ skipping 19 matching lines @@
   std::vector<Node> equivalent_;
 
   std::map<MemoKey, Node, MemoKeyLess> memos_;
 
   DISALLOW_COPY_AND_ASSIGN(CodeGen);
 };
 
 }  // namespace sandbox
 
 #endif  // SANDBOX_LINUX_SECCOMP_BPF_CODEGEN_H__