Move some methods related to single-process out of content/public, since they're only called inside content.

R=scottmg@chromium.org

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

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

3 files changed, 4 insertions, 16 deletions

diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h
index c22d449..6424099 100644
--- a/content/public/browser/render_process_host.h
+++ b/content/public/browser/render_process_host.h
@@ -31,9 +31,6 @@ class RenderWidgetHost;
 class StoragePartition;
 struct GlobalRequestID;
 
-typedef base::Thread* (*RendererMainThreadFactoryFunction)(
-    const std::string& id);
-
 // Interface that represents the browser side of the browser <-> renderer
 // communication channel. There will generally be one RenderProcessHost per
 // renderer process.
@@ -285,9 +282,6 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::Sender,
   // Returns the current max number of renderer processes used by the content
   // module.
   static size_t GetMaxRendererProcessCount();
-
-  static void RegisterRendererMainThreadFactory(
-      RendererMainThreadFactoryFunction create);
 };
 
 }  // namespace content.
diff --git a/content/public/browser/utility_process_host.h b/content/public/browser/utility_process_host.h
index c39c76e..756d50f 100644
--- a/content/public/browser/utility_process_host.h
+++ b/content/public/browser/utility_process_host.h
@@ -20,9 +20,6 @@ namespace content {
 class UtilityProcessHostClient;
 struct ChildProcessData;
 
-typedef base::Thread* (*UtilityMainThreadFactoryFunction)(
-    const std::string& id);
-
 // This class acts as the browser-side host to a utility child process.  A
 // utility process is a short-lived process that is created to run a specific
 // task.  This class lives solely on the IO thread.
@@ -72,9 +69,6 @@ class UtilityProcessHost : public IPC::Sender,
 #if defined(OS_POSIX)
   virtual void SetEnv(const base::EnvironmentMap& env) = 0;
 #endif
-
-  CONTENT_EXPORT static void RegisterUtilityMainThreadFactory(
-      UtilityMainThreadFactoryFunction create);
 };
 
 };  // namespace content
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index 53e5693..9f9be53 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -11,10 +11,10 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
+#include "content/browser/utility_process_host_impl.h"
 #include "content/common/url_schemes.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/renderer/in_process_renderer_thread.h"
 #include "content/utility/in_process_utility_thread.h"
@@ -78,9 +78,9 @@ void ContentTestSuiteBase::RegisterContentSchemes(
 
 void ContentTestSuiteBase::RegisterInProcessThreads() {
 #if !defined(OS_IOS)
-  UtilityProcessHost::RegisterUtilityMainThreadFactory(
+  UtilityProcessHostImpl::RegisterUtilityMainThreadFactory(
       CreateInProcessUtilityThread);
-  RenderProcessHost::RegisterRendererMainThreadFactory(
+  RenderProcessHostImpl::RegisterRendererMainThreadFactory(
       CreateInProcessRendererThread);
   GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);
 #endif