Revert of Implement '--gpu-sandbox-failures-nonfatal' flag.

content/browser/gpu/gpu_process_host.cc

 // Copyright (c) 2012 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/browser/gpu/gpu_process_host.h"
 
 #include "base/base64.h"
 #include "base/base_switches.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 30 matching lines @@
 
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "content/common/sandbox_win.h"
 #include "content/public/common/sandboxed_process_launcher_delegate.h"
 #include "sandbox/win/src/sandbox_policy.h"
 #include "ui/gfx/switches.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chromeos/chromeos_switches.h"
+#endif
+
 #if defined(USE_OZONE)
 #include "ui/ozone/ozone_switches.h"
 #endif
 
 namespace content {
 
 bool GpuProcessHost::gpu_enabled_ = true;
 bool GpuProcessHost::hardware_gpu_enabled_ = true;
 
 namespace {
@@ skipping 1021 matching lines @@
     switches::kDisableGpuWatchdog,
     switches::kDisableLogging,
     switches::kDisableSeccompFilterSandbox,
 #if defined(ENABLE_WEBRTC)
     switches::kDisableWebRtcHWEncoding,
 #endif
     switches::kEnableLogging,
     switches::kEnableShareGroupAsyncTextureUpload,
     switches::kGpuStartupDialog,
     switches::kGpuSandboxAllowSysVShm,
-    switches::kGpuSandboxFailuresNonfatal,
     switches::kLoggingLevel,
     switches::kNoSandbox,
     switches::kTestGLLib,
     switches::kTraceStartup,
     switches::kV,
     switches::kVModule,
 #if defined(OS_MACOSX)
     switches::kEnableSandboxLogging,
 #endif
+#if defined(OS_CHROMEOS)
+    chromeos::switches::kGpuSandboxFailuresNonfatal,
+#endif
 #if defined(USE_OZONE)
     switches::kOzonePlatform,
 #endif
 #if defined(OS_WIN)
     switches::kHighDPISupport,
 #endif
   };
   cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
                              arraysize(kSwitchNames));
   cmd_line->CopySwitchesFrom(
@@ skipping 106 matching lines @@
   TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
   ClientIdToShaderCacheMap::iterator iter =
       client_id_to_shader_cache_.find(client_id);
   // If the cache doesn't exist then this is an off the record profile.
   if (iter == client_id_to_shader_cache_.end())
     return;
   iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
 }
 
 }  // namespace content