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

content/public/common/content_client.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/public/common/content_client.h"
 
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "ui/gfx/image/image.h"
 #include "webkit/common/user_agent/user_agent.h"
@@ skipping 12 matching lines @@
     ContentBrowserClient* rv = g_client->browser_;
     g_client->browser_ = b;
     return rv;
   }
 
   static ContentRendererClient* SetRenderer(ContentRendererClient* r) {
     ContentRendererClient* rv = g_client->renderer_;
     g_client->renderer_ = r;
     return rv;
   }
+
+  static ContentUtilityClient* SetUtility(ContentUtilityClient* u) {
+    ContentUtilityClient* rv = g_client->utility_;
+    g_client->utility_ = u;
+    return rv;
+  }
 };
 
 void SetContentClient(ContentClient* client) {
   g_client = client;
 
   // Set the default user agent as provided by the client. We need to make
   // sure this is done before webkit_glue::GetUserAgent() is called (so that
   // the UA doesn't change).
   if (client) {
     webkit_glue::SetUserAgent(client->GetUserAgent(), false);
   }
 }
 
 ContentClient* GetContentClient() {
   return g_client;
 }
 
 ContentBrowserClient* SetBrowserClientForTesting(ContentBrowserClient* b) {
   return InternalTestInitializer::SetBrowser(b);
 }
 
 ContentRendererClient* SetRendererClientForTesting(ContentRendererClient* r) {
   return InternalTestInitializer::SetRenderer(r);
 }
 
+ContentUtilityClient* SetUtilityClientForTesting(ContentUtilityClient* u) {
+  return InternalTestInitializer::SetUtility(u);
+}
+
 const std::string& GetUserAgent(const GURL& url) {
   DCHECK(g_client);
   return webkit_glue::GetUserAgent(url);
 }
 
 webkit::ppapi::HostGlobals* GetHostGlobals() {
 #if defined(ENABLE_PLUGINS)
   return webkit::ppapi::HostGlobals::Get();
 #else
   return NULL;
@@ skipping 54 matching lines @@
     int* sandbox_profile_resource_id) const {
   return false;
 }
 
 std::string ContentClient::GetCarbonInterposePath() const {
   return std::string();
 }
 #endif
 
 }  // namespace content