Fix names of in-process threads, tidy gpu DEPS

content/content_gpu.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../skia/skia.gyp:skia',
     '../ui/gl/gl.gyp:gl',
   ],
   'sources': [
     'gpu/gpu_main.cc',
     'gpu/gpu_process.cc',
     'gpu/gpu_process.h',
     'gpu/gpu_child_thread.cc',
     'gpu/gpu_child_thread.h',
-    'gpu/gpu_main_thread.cc',
-    'gpu/gpu_main_thread.h',
     'gpu/gpu_watchdog_thread.cc',
     'gpu/gpu_watchdog_thread.h',
+    'gpu/in_process_gpu_thread.cc',
+    'gpu/in_process_gpu_thread.h',
   ],
   'include_dirs': [
     '..',
   ],
   'conditions': [
     ['OS=="win"', {
       'include_dirs': [
         '<(DEPTH)/third_party/khronos',
         '<(DEPTH)/third_party/angle_dx11/src',
         '<(DEPTH)/third_party/wtl/include',
@@ skipping 43 matching lines @@
         },
       ],
     }],
     ['target_arch!="arm" and chromeos == 1', {
       'include_dirs': [
         '<(DEPTH)/third_party/libva',
       ],
     }],
   ],
 }