| Index: content/browser/gpu/gpu_data_manager_impl_private.cc
|
| diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
|
| index b3b1627a78f5c6180a32abf66f36e9b46641753d..1b484cede425d9a109d8f758811f57c78b5e7f37 100644
|
| --- a/content/browser/gpu/gpu_data_manager_impl_private.cc
|
| +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
|
| @@ -495,8 +495,7 @@ void GpuDataManagerImplPrivate::Initialize() {
|
| return;
|
| }
|
|
|
| - const base::CommandLine* command_line =
|
| - base::CommandLine::ForCurrentProcess();
|
| + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| if (command_line->HasSwitch(switches::kSkipGpuDataLoading))
|
| return;
|
|
|
| @@ -540,6 +539,12 @@ void GpuDataManagerImplPrivate::Initialize() {
|
| InitializeImpl(gpu_blacklist_string,
|
| gpu_driver_bug_list_string,
|
| gpu_info);
|
| +
|
| + if (command_line->HasSwitch(switches::kSingleProcess) ||
|
| + command_line->HasSwitch(switches::kInProcessGPU)) {
|
| + command_line->AppendSwitch(switches::kDisableGpuWatchdog);
|
| + AppendGpuCommandLine(command_line);
|
| + }
|
| }
|
|
|
| void GpuDataManagerImplPrivate::UpdateGpuInfoHelper() {
|
|
|