Fix names of in-process threads, tidy gpu DEPS

Follow-up after http://crrev.com/217968 per comments on
https://chromiumcodereview.appspot.com/23235002/

R=jam@chromium.org
BUG=237249

Review URL: https://chromiumcodereview.appspot.com/23452016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221199 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 19 insertions, 18 deletions

diff --git a/content/utility/utility_main_thread.cc b/content/utility/in_process_utility_thread.cc
index 7d97399..8859e51 100644
--- a/content/utility/utility_main_thread.cc
+++ b/content/utility/in_process_utility_thread.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/utility/utility_main_thread.h"
+#include "content/utility/in_process_utility_thread.h"
 
 #include "content/child/child_process.h"
 #include "content/utility/utility_thread_impl.h"
@@ -13,23 +13,24 @@ namespace content {
 // are many globals used in the utility process.
 static base::LazyInstance<base::Lock> g_one_utility_thread_lock;
 
-UtilityMainThread::UtilityMainThread(const std::string& channel_id)
+InProcessUtilityThread::InProcessUtilityThread(const std::string& channel_id)
     : Thread("Chrome_InProcUtilityThread"), channel_id_(channel_id) {
 }
 
-UtilityMainThread::~UtilityMainThread() {
+InProcessUtilityThread::~InProcessUtilityThread() {
   Stop();
 }
 
-void UtilityMainThread::Init() {
+void InProcessUtilityThread::Init() {
   // We need to return right away or else the main thread that started us will
   // hang.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
-      base::Bind(&UtilityMainThread::InitInternal, base::Unretained(this)));
+      base::Bind(&InProcessUtilityThread::InitInternal,
+                 base::Unretained(this)));
 }
 
-void UtilityMainThread::CleanUp() {
+void InProcessUtilityThread::CleanUp() {
   child_process_.reset();
 
   // See comment in RendererMainThread.
@@ -37,14 +38,14 @@ void UtilityMainThread::CleanUp() {
   g_one_utility_thread_lock.Get().Release();
 }
 
-void UtilityMainThread::InitInternal() {
+void InProcessUtilityThread::InitInternal() {
   g_one_utility_thread_lock.Get().Acquire();
   child_process_.reset(new ChildProcess());
   child_process_->set_main_thread(new UtilityThreadImpl(channel_id_));
 }
 
-base::Thread* CreateUtilityMainThread(const std::string& channel_id) {
-  return new UtilityMainThread(channel_id);
+base::Thread* CreateInProcessUtilityThread(const std::string& channel_id) {
+  return new InProcessUtilityThread(channel_id);
 }
 
 }  // namespace content
diff --git a/content/utility/utility_main_thread.h b/content/utility/in_process_utility_thread.h
index 43e22b7..7f4c732 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_