Snapshot of all changes to get jumbo in blink and content.

content/common/sandbox_linux/bpf_gpu_policy_linux.cc

 // Copyright (c) 2013 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 "content/common/sandbox_linux/bpf_gpu_policy_linux.h"
 
 #include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/socket.h>
@@ skipping 30 matching lines @@
 using sandbox::bpf_dsl::ResultExpr;
 using sandbox::bpf_dsl::Trap;
 using sandbox::syscall_broker::BrokerFilePermission;
 using sandbox::syscall_broker::BrokerProcess;
 using sandbox::SyscallSets;
 
 namespace content {
 
 namespace {
 
-inline bool IsChromeOS() {
+inline bool IsChromeOSFoo() {
 #if defined(OS_CHROMEOS)
   return true;
 #else
   return false;
 #endif
 }
 
 inline bool IsArchitectureX86_64() {
 #if defined(__x86_64__)
   return true;
 #else
   return false;
 #endif
 }
 
 inline bool IsArchitectureI386() {
 #if defined(__i386__)
   return true;
 #else
   return false;
 #endif
 }
 
-inline bool IsArchitectureArm() {
+inline bool IsArchitectureArmFoo() {
 #if defined(__arm__) || defined(__aarch64__)
   return true;
 #else
   return false;
 #endif
 }
 
 inline bool UseV4L2Codec() {
 #if defined(USE_V4L2_CODEC)
   return true;
@@ skipping 193 matching lines @@
         return Allow();
 
       // Default on the baseline policy.
       return SandboxBPFBasePolicy::EvaluateSyscall(sysno);
   }
 }
 
 bool GpuProcessPolicy::PreSandboxHook() {
   // Warm up resources needed by the policy we're about to enable and
   // eventually start a broker process.
-  const bool chromeos_arm_gpu = IsChromeOS() && IsArchitectureArm();
+  const bool chromeos_arm_gpu = IsChromeOSFoo() && IsArchitectureArmFoo();
   // This policy is for x86 or Desktop.
   DCHECK(!chromeos_arm_gpu);
 
   DCHECK(!broker_process());
   // Create a new broker process.
   InitGpuBrokerProcess(
       GpuBrokerProcessPolicy::Create,
       std::vector<BrokerFilePermission>());  // No extra files in whitelist.
 
   if (IsArchitectureX86_64() || IsArchitectureI386()) {
@@ skipping 37 matching lines @@
   static const char kNvidiaParamsPath[] = "/proc/driver/nvidia/params";
 
   static const char kDevShm[] = "/dev/shm/";
 
   CHECK(broker_process_ == NULL);
 
   // All GPU process policies need these files brokered out.
   std::vector<BrokerFilePermission> permissions;
   permissions.push_back(BrokerFilePermission::ReadOnly(kDriRcPath));
 
-  if (!IsChromeOS()) {
+  if (!IsChromeOSFoo()) {
     // For shared memory.
     permissions.push_back(
         BrokerFilePermission::ReadWriteCreateUnlinkRecursive(kDevShm));
     // For DRI cards.
     for (int i = 0; i <= 9; ++i) {
       permissions.push_back(BrokerFilePermission::ReadWrite(
           base::StringPrintf("%s%d", kDriCardBasePath, i)));
     }
     // For Nvidia GLX driver.
     permissions.push_back(BrokerFilePermission::ReadWrite(kNvidiaCtlPath));
@@ skipping 18 matching lines @@
   }
 
   broker_process_ = new BrokerProcess(GetFSDeniedErrno(), permissions);
   // The initialization callback will perform generic initialization and then
   // call broker_sandboxer_callback.
   CHECK(broker_process_->Init(base::Bind(&UpdateProcessTypeAndEnableSandbox,
                                          broker_sandboxer_allocator)));
 }
 
 }  // namespace content