bpf_dsl: fix argument-dependent lookup of BoolExpr operators

components/nacl/loader/nonsfi/nonsfi_sandbox.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 "components/nacl/loader/nonsfi/nonsfi_sandbox.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/net.h>
 #include <sys/prctl.h>
@@ skipping 19 matching lines @@
 
 using sandbox::CrashSIGSYS;
 using sandbox::CrashSIGSYSClone;
 using sandbox::CrashSIGSYSPrctl;
 using sandbox::bpf_dsl::Allow;
 using sandbox::bpf_dsl::Arg;
 using sandbox::bpf_dsl::Error;
 using sandbox::bpf_dsl::If;
 using sandbox::bpf_dsl::ResultExpr;
 
-// TODO(mdempsky): Make BoolExpr a standalone class so these operators can
-// be resolved via argument-dependent lookup.
-using sandbox::bpf_dsl::operator&&;
-using sandbox::bpf_dsl::operator||;
-
 namespace nacl {
 namespace nonsfi {
 namespace {
 
 ResultExpr RestrictFcntlCommands() {
   const Arg<int> cmd(1);
   const Arg<long> long_arg(2);
 
   // We allow following cases:
   // 1. F_SETFD + FD_CLOEXEC: libevent's epoll_init uses this.
@@ skipping 252 matching lines @@
       scoped_ptr<sandbox::SandboxBPFPolicy>(
           new nacl::nonsfi::NaClNonSfiBPFSandboxPolicy()));
   if (!sandbox_is_initialized)
     return false;
   RunSandboxSanityChecks();
   return true;
 }
 
 }  // namespace nonsfi
 }  // namespace nacl