Fix names of in-process threads, tidy gpu DEPS

content/public/test/content_test_suite_base.cc

 // 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.
 
 #include "content/public/test/content_test_suite_base.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/test_suite.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/common/url_schemes.h"
-#include "content/gpu/gpu_main_thread.h"
+#include "content/gpu/in_process_gpu_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
-#include "content/renderer/renderer_main_thread.h"
-#include "content/utility/utility_main_thread.h"
+#include "content/renderer/in_process_renderer_thread.h"
+#include "content/utility/in_process_utility_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ui_base_paths.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "content/browser/android/browser_jni_registrar.h"
 #include "content/common/android/common_jni_registrar.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 #include "ui/android/ui_jni_registrar.h"
@@ skipping 31 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   content::android::RegisterCommonJni(env);
   content::android::RegisterBrowserJni(env);
   media::RegisterJni(env);
   net::android::RegisterJni(env);
   ui::android::RegisterJni(env);
   ui::shell_dialogs::RegisterJni(env);
 #endif
 
 #if !defined(OS_IOS)
-  UtilityProcessHost::RegisterUtilityMainThreadFactory(CreateUtilityMainThread);
+  UtilityProcessHost::RegisterUtilityMainThreadFactory(
+      CreateInProcessUtilityThread);
   RenderProcessHost::RegisterRendererMainThreadFactory(
-      CreateRendererMainThread);
-  GpuProcessHost::RegisterGpuMainThreadFactory(CreateGpuMainThread);
+      CreateInProcessRendererThread);
+  GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);
   if (external_libraries_enabled_)
     media::InitializeMediaLibraryForTesting();
 #endif
 
   scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization());
   SetContentClient(client_for_init.get());
   RegisterContentSchemes(false);
   SetContentClient(NULL);
 
   RegisterPathProvider();
   ui::RegisterPathProvider();
 
   testing::UnitTest::GetInstance()->listeners().Append(
       new ContentTestSuiteBaseListener);
 }
 
 }  // namespace content