Set up content in-process main threads via factory

content/browser/utility_process_host_impl.h

Index: content/browser/utility_process_host_impl.h
diff --git a/content/browser/utility_process_host_impl.h b/content/browser/utility_process_host_impl.h
index 6eecd3d89855cb58d10cf3f922cbba549620c84a..40f9acccba366bafae17ba034bf1912ec294da49 100644
--- a/content/browser/utility_process_host_impl.h
+++ b/content/browser/utility_process_host_impl.h
@@ -13,6 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/threading/thread.h"

[piman, 2013/08/15 22:26:11]

nit: forward declare instead?

[scottmg, 2013/08/15 22:40:37]

Done.

 #include "content/public/browser/browser_child_process_host_delegate.h"
 #include "content/public/browser/utility_process_host.h"
 
@@ -22,7 +23,6 @@ class SequencedTaskRunner;
 
 namespace content {
 class BrowserChildProcessHostImpl;
-class UtilityMainThread;
 
 class CONTENT_EXPORT UtilityProcessHostImpl
     : public NON_EXPORTED_BASE(UtilityProcessHost),
@@ -83,10 +83,8 @@ class CONTENT_EXPORT UtilityProcessHostImpl
 
   scoped_ptr<BrowserChildProcessHostImpl> process_;
 
-#if !defined(CHROME_MULTIPLE_DLL)
   // Used in single-process mode instead of process_.
-  scoped_ptr<UtilityMainThread> in_process_thread_;
-#endif
+  scoped_ptr<base::Thread> in_process_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(UtilityProcessHostImpl);
 };