Fix names of in-process threads, tidy gpu DEPS

content/utility/in_process_utility_thread.h

Index: content/utility/in_process_utility_thread.h
diff --git a/content/utility/utility_main_thread.h b/content/utility/in_process_utility_thread.h
similarity index 58%
rename from content/utility/utility_main_thread.h
rename to content/utility/in_process_utility_thread.h
index 43e22b74a1aacc9beef393e8a51f17403586ebef..7f4c732667b1ffa1a48d074bc613e8336b64a0d0 100644
--- a/content/utility/utility_main_thread.h
+++ b/content/utility/in_process_utility_thread.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_UTILITY_UTILITY_MAIN_THREAD_H_
-#define CONTENT_UTILITY_UTILITY_MAIN_THREAD_H_
+#ifndef CONTENT_UTILITY_IN_PROCESS_UTILITY_THREAD_H_
+#define CONTENT_UTILITY_IN_PROCESS_UTILITY_THREAD_H_
 
 #include <string>
 
@@ -14,12 +14,12 @@ namespace content {
 
 class ChildProcess;
 
-class UtilityMainThread : public base::Thread {
+class InProcessUtilityThread : public base::Thread {
  public:
-  UtilityMainThread(const std::string& channel_id);
-  virtual ~UtilityMainThread();
- private:
+  InProcessUtilityThread(const std::string& channel_id);
+  virtual ~InProcessUtilityThread();
 
+ private:
   // base::Thread implementation:
   virtual void Init() OVERRIDE;
   virtual void CleanUp() OVERRIDE;
@@ -29,12 +29,12 @@ class UtilityMainThread : public base::Thread {
   std::string channel_id_;
   scoped_ptr<ChildProcess> child_process_;
 
-  DISALLOW_COPY_AND_ASSIGN(UtilityMainThread);
+  DISALLOW_COPY_AND_ASSIGN(InProcessUtilityThread);
 };
 
-CONTENT_EXPORT base::Thread* CreateUtilityMainThread(
+CONTENT_EXPORT base::Thread* CreateInProcessUtilityThread(
     const std::string& channel_id);
 
 }  // namespace content
 
-#endif  // CONTENT_UTILITY_UTILITY_MAIN_THREAD_H_
+#endif  // CONTENT_UTILITY_IN_PROCESS_UTILITY_THREAD_H_