Make utility process run in-process when running in single-process mode.

content/browser/utility_process_host_impl.h

Index: content/browser/utility_process_host_impl.h
===================================================================
--- content/browser/utility_process_host_impl.h	(revision 209067)
+++ content/browser/utility_process_host_impl.h	(working copy)
@@ -13,6 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "content/public/browser/child_process_data.h"
 #include "content/public/browser/browser_child_process_host_delegate.h"
 #include "content/public/browser/utility_process_host.h"
 
@@ -22,6 +23,7 @@
 
 namespace content {
 class BrowserChildProcessHostImpl;
+class UtilityMainThread;
 
 class CONTENT_EXPORT UtilityProcessHostImpl
     : public NON_EXPORTED_BASE(UtilityProcessHost),
@@ -78,6 +80,10 @@
 
   scoped_ptr<BrowserChildProcessHostImpl> process_;
 
+  // Used in single-process mode instead of process_.
+  scoped_ptr<UtilityMainThread> in_process_thread_;
+  ChildProcessData fake_process_data_;
+
   DISALLOW_COPY_AND_ASSIGN(UtilityProcessHostImpl);
 };