Insert in-process GPU switches on UI thread

For in-process gpu, the CommandLine of the current process is a shared
resource and cannot be safely manipulated on the IO thread.

This moves inserting the gpu command line switches to the UI thread, and
slightly start up. Although still need additional fixes to start up code
to ensure it's safe to manipulate it on UI thread.

This also fixes the bug of inserting gpu switches when GpuProcessHost is
not used, for example in android webview.

BUG=450396

Review URL: https://codereview.chromium.org/865063002

Cr-Commit-Position: refs/heads/master@{#313177}

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() {

content/browser/gpu/gpu_process_host.cc

@@ -504,13 +504,6 @@ bool GpuProcessHost::Init() {
 
   if (in_process_) {
     DCHECK(g_gpu_main_thread_factory);
-    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-    command_line->AppendSwitch(switches::kDisableGpuWatchdog);
-
-    GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance();
-    DCHECK(gpu_data_manager);
-    gpu_data_manager->AppendGpuCommandLine(command_line);
-
     in_process_gpu_thread_.reset(g_gpu_main_thread_factory(channel_id));
     base::Thread::Options options;
 #if defined(OS_WIN)