Cut some more dependencies from browser to child for multiple_dll mode

content/browser/utility_process_host_impl.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/browser/utility_process_host_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 40 matching lines @@
 
 private:
   base::FilePath exposed_dir_;
 };
 #endif
 
 // We want to ensure there's only one utility thread running at a time, as there
 // are many globals used in the utility process.
 static base::LazyInstance<base::Lock> g_one_utility_thread_lock;
 
+// Single process not supported in multiple dll mode currently.
+#if !defined(CHROME_MULTIPLE_DLL)
 class UtilityMainThread : public base::Thread {
  public:
   UtilityMainThread(const std::string& channel_id)
       : Thread("Chrome_InProcUtilityThread"),
         channel_id_(channel_id) {
   }
 
   virtual ~UtilityMainThread() {
     Stop();
   }
@@ skipping 20 matching lines @@
     g_one_utility_thread_lock.Get().Acquire();
     child_process_.reset(new ChildProcess());
     child_process_->set_main_thread(new UtilityThreadImpl(channel_id_));
   }
 
   std::string channel_id_;
   scoped_ptr<ChildProcess> child_process_;
 
   DISALLOW_COPY_AND_ASSIGN(UtilityMainThread);
 };
+#endif  // !CHROME_MULTIPLE_DLL
 
 UtilityProcessHost* UtilityProcessHost::Create(
     UtilityProcessHostClient* client,
     base::SequencedTaskRunner* client_task_runner) {
   return new UtilityProcessHostImpl(client, client_task_runner);
 }
 
 UtilityProcessHostImpl::UtilityProcessHostImpl(
     UtilityProcessHostClient* client,
     base::SequencedTaskRunner* client_task_runner)
@@ skipping 75 matching lines @@
 
   // Name must be set or metrics_service will crash in any test which
   // launches a UtilityProcessHost.
   process_.reset(new BrowserChildProcessHostImpl(PROCESS_TYPE_UTILITY, this));
   process_->SetName(ASCIIToUTF16("utility process"));
 
   std::string channel_id = process_->GetHost()->CreateChannel();
   if (channel_id.empty())
     return false;
 
+  // Multiple

[jam, 2013/07/23 15:19:36]

nit: comment cut off?

[scottmg, 2013/07/23 15:33:15]

wat

Done.

+#if !defined(CHROME_MULTIPLE_DLL)
   if (RenderProcessHost::run_renderer_in_process()) {
     // See comment in RenderProcessHostImpl::Init() for the background on why we
     // support single process mode this way.
     in_process_thread_.reset(new UtilityMainThread(channel_id));
     in_process_thread_->Start();
-  } else {
+  } else
+#endif  // !CHROME_MULTIPLE_DLL
+  {
     const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
     int child_flags = child_flags_;
 
 #if defined(OS_POSIX)
     bool has_cmd_prefix = browser_command_line.HasSwitch(
         switches::kUtilityCmdPrefix);
 
     // When running under gdb, forking /proc/self/exe ends up forking the gdb
     // executable instead of Chromium. It is almost safe to assume that no
     // updates will happen while a developer is running with
@@ skipping 70 matching lines @@
 }
 
 void UtilityProcessHostImpl::OnProcessCrashed(int exit_code) {
   client_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&UtilityProcessHostClient::OnProcessCrashed, client_.get(),
             exit_code));
 }
 
 }  // namespace content