Merge 212415 "reland of http://crrev.com/212230 Create top-level..."

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
===================================================================
--- content/browser/renderer_host/render_process_host_impl.cc	(revision 212608)
+++ content/browser/renderer_host/render_process_host_impl.cc	(working copy)
@@ -165,6 +165,8 @@
 
 }  // namespace
 
+#if !defined(CHROME_MULTIPLE_DLL)
+
 // This class creates the IO thread for the renderer when running in
 // single-process mode.  It's not used in multi-process mode.
 class RendererMainThread : public base::Thread {
@@ -208,6 +210,8 @@
   DISALLOW_COPY_AND_ASSIGN(RendererMainThread);
 };
 
+#endif
+
 namespace {
 
 // Helper class that we pass to ResourceMessageFilter so that it can find the
@@ -501,8 +505,8 @@
 
   CreateMessageFilters();
 
-  // Single-process mode not supported in split-dll mode.
-#if !defined(CHROME_SPLIT_DLL)
+  // Single-process mode not supported in multiple-dll mode currently.
+#if !defined(CHROME_MULTIPLE_DLL)
   if (run_renderer_in_process()) {
     // Crank up a thread and run the initialization there.  With the way that
     // messages flow between the browser and renderer, this thread is required
@@ -525,7 +529,7 @@
 
     OnProcessLaunched();  // Fake a callback that the process is ready.
   } else
-#endif  // !CHROME_SPLIT_DLL
+#endif  // !CHROME_MULTIPLE_DLL
   {
     // Build command line for renderer.  We call AppendRendererCommandLine()
     // first so the process type argument will appear first.