Fix --no-sandbox and --disable-gpu-sandbox on Mali.

gpu/ipc/service/gpu_init.cc

 // Copyright 2016 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 "gpu/ipc/service/gpu_init.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
@@ skipping 163 matching lines @@
       gpu_info_.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
     return false;
 #endif
   gpu_info_.in_process_gpu = false;
 
   gpu_info_.passthrough_cmd_decoder =
       command_line.HasSwitch(switches::kUsePassthroughCmdDecoder);
 
   sandbox_helper_->PreSandboxStartup();
 
+  bool attempted_startsandbox = false;
 #if defined(OS_LINUX)
   // On Chrome OS ARM Mali, GPU driver userspace creates threads when
   // initializing a GL context, so start the sandbox early.
-  if (command_line.HasSwitch(switches::kGpuSandboxStartEarly))
+  if (command_line.HasSwitch(switches::kGpuSandboxStartEarly)) {
     gpu_info_.sandboxed =
         sandbox_helper_->EnsureSandboxInitialized(watchdog_thread_.get());
+    attempted_startsandbox = true;
+  }
+
 #endif  // defined(OS_LINUX)
 
   base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
 
 #if defined(USE_OZONE)
   // Initialize Ozone GPU after the watchdog in case it hangs. The sandbox
   // may also have started at this point.
   ui::OzonePlatform::InitParams params;
   params.single_process = false;
   ui::OzonePlatform::InitializeForGPU(params);
@@ skipping 51 matching lines @@
   // Software GL is expected to run slowly, so disable the watchdog
   // in that case.
   if (gl::GetGLImplementation() == gl::GetSoftwareGLImplementation()) {
     if (watchdog_thread_)
       watchdog_thread_->Stop();
     watchdog_thread_ = nullptr;
   } else if (enable_watchdog && delayed_watchdog_enable) {
     watchdog_thread_ = gpu::GpuWatchdogThread::Create();
   }
 
-  if (!gpu_info_.sandboxed)
+  if (!gpu_info_.sandboxed && !attempted_startsandbox) {
     gpu_info_.sandboxed =
         sandbox_helper_->EnsureSandboxInitialized(watchdog_thread_.get());
+  }
+
   return true;
 }
 
 }  // namespace gpu