| Index: content/common/sandbox_linux/bpf_gpu_policy_linux.cc
|
| diff --git a/content/common/sandbox_linux/bpf_gpu_policy_linux.cc b/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
|
| index 74f9871fc30a92c8cd3abca5527c5ebb896937d1..5db8a05ae331ef66eb8f005eeb9a67283ce43f26 100644
|
| --- a/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
|
| +++ b/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
|
| @@ -148,15 +148,15 @@ void UpdateProcessTypeToGpuBroker() {
|
| base::CommandLine::StringVector exec =
|
| base::CommandLine::ForCurrentProcess()->GetArgs();
|
| base::CommandLine::Reset();
|
| - base::CommandLine::Init(0, NULL);
|
| + base::CommandLine::Init(0, nullptr);
|
| base::CommandLine::ForCurrentProcess()->InitFromArgv(exec);
|
| base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
|
| switches::kProcessType, "gpu-broker");
|
|
|
| // Update the process title. The argv was already cached by the call to
|
| // SetProcessTitleFromCommandLine in content_main_runner.cc, so we can pass
|
| - // NULL here (we don't have the original argv at this point).
|
| - SetProcessTitleFromCommandLine(NULL);
|
| + // nullptr here (we don't have the original argv at this point).
|
| + SetProcessTitleFromCommandLine(nullptr);
|
| }
|
|
|
| bool UpdateProcessTypeAndEnableSandbox(sandbox::bpf_dsl::SandboxBPFDSLPolicy* (
|
| @@ -169,7 +169,7 @@ bool UpdateProcessTypeAndEnableSandbox(sandbox::bpf_dsl::SandboxBPFDSLPolicy* (
|
|
|
| } // namespace
|
|
|
| -GpuProcessPolicy::GpuProcessPolicy() : broker_process_(NULL) {}
|
| +GpuProcessPolicy::GpuProcessPolicy() : broker_process_(nullptr) {}
|
|
|
| GpuProcessPolicy::~GpuProcessPolicy() {}
|
|
|
| @@ -225,7 +225,7 @@ bool GpuProcessPolicy::PreSandboxHook() {
|
| // Accelerated video dlopen()'s some shared objects
|
| // inside the sandbox, so preload them now.
|
| if (IsAcceleratedVideoEnabled()) {
|
| - const char* I965DrvVideoPath = NULL;
|
| + const char* I965DrvVideoPath = nullptr;
|
|
|
| if (IsArchitectureX86_64()) {
|
| I965DrvVideoPath = "/usr/lib64/va/drivers/i965_drv_video.so";
|
| @@ -249,7 +249,7 @@ void GpuProcessPolicy::InitGpuBrokerProcess(
|
| static const char kDriRcPath[] = "/etc/drirc";
|
| static const char kDriCard0Path[] = "/dev/dri/card0";
|
|
|
| - CHECK(broker_process_ == NULL);
|
| + CHECK(broker_process_ == nullptr);
|
|
|
| // All GPU process policies need these files brokered out.
|
| std::vector<std::string> read_whitelist;
|
|
|