Remove USE_OZONE in video files

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 60 matching lines @@
 }
 
 inline bool IsArchitectureArm() {
 #if defined(__arm__) || defined(__aarch64__)
   return true;
 #else
   return false;
 #endif
 }
 
-inline bool IsOzone() {
-#if defined(USE_OZONE)
+inline bool UseV4L2Codec() {
+#if defined(USE_V4L2_CODEC)
   return true;
 #else
   return false;
 #endif
 }
 
 inline bool UseLibV4L2() {
 #if defined(USE_LIBV4L2)
   return true;
 #else
@@ skipping 243 matching lines @@
 
   CHECK(broker_process_ == NULL);
 
   // All GPU process policies need these files brokered out.
   std::vector<BrokerFilePermission> permissions;
   permissions.push_back(BrokerFilePermission::ReadWrite(kDriCard0Path));
   permissions.push_back(BrokerFilePermission::ReadOnly(kDriRcPath));
   if (!IsChromeOS()) {
     permissions.push_back(
         BrokerFilePermission::ReadWriteCreateUnlinkRecursive(kDevShm));
-  } else if (IsArchitectureArm() || IsOzone()){

[Jorge Lucangeli Obes, 2016/07/13 13:09:17]

Why did you remove IsArchitectureArm?

[wuchengli, 2016/07/13 13:26:04]

We now use USE_V4L2_CODEC to decide if a device can have V4L2 video device. All
ChromeOS devices, ARM or Intel, have USE_V4L2_CODEC. That is passed from
ChromeOS build system. So USE_V4L2_CODEC is the only thing we need to check.

+  } else if (UseV4L2Codec()){
     AddV4L2GpuWhitelist(&permissions);
     if (UseLibV4L2()) {
       dlopen("/usr/lib/libv4l2.so", RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
       // This is a device-specific encoder plugin.
       dlopen("/usr/lib/libv4l/plugins/libv4l-encplugin.so",
           RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
     }
   }
 
   // Add eventual extra files from permissions_extra.
   for (const auto& perm : permissions_extra) {
     permissions.push_back(perm);
   }
 
   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