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

chrome/test/base/chrome_test_suite.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 "chrome/test/base/chrome_test_suite.h"
 
 #if defined(OS_CHROMEOS)
 #include <stdio.h>
 #include <unistd.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/stats_table.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/chrome_manifest_handlers.h"
 #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
+#include "chrome/utility/chrome_content_utility_client.h"
 #include "content/public/test/test_launcher.h"
 #include "extensions/common/extension_paths.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/dns/mock_host_resolver.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/resource/resource_handle.h"
 
 #if defined(OS_ANDROID)
@@ skipping 98 matching lines @@
 
   virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
     DCHECK(!g_browser_process);
     g_browser_process = new TestingBrowserProcess;
 
     content_client_.reset(new chrome::ChromeContentClient);
     content::SetContentClient(content_client_.get());
     // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
 #if !defined(OS_IOS)
     browser_content_client_.reset(new chrome::ChromeContentBrowserClient());
-    SetBrowserClientForTesting(browser_content_client_.get());
+    content::SetBrowserClientForTesting(browser_content_client_.get());
+    utility_content_client_.reset(new chrome::ChromeContentUtilityClient());
+    content::SetUtilityClientForTesting(utility_content_client_.get());
 #endif
 
     SetUpHostResolver();
   }
 
   virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
     if (g_browser_process) {
       BrowserProcess* browser_process = g_browser_process;
       // g_browser_process must be NULL during its own destruction.
       g_browser_process = NULL;
       delete browser_process;
     }
 
     // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
 #if !defined(OS_IOS)
     browser_content_client_.reset();
+    utility_content_client_.reset();
 #endif
     content_client_.reset();
     content::SetContentClient(NULL);
 
     TearDownHostResolver();
   }
 
  private:
   void SetUpHostResolver() {
     host_resolver_proc_ = new LocalHostResolverProc;
     scoped_host_resolver_proc_.reset(
         new net::ScopedDefaultHostResolverProc(host_resolver_proc_.get()));
   }
 
   void TearDownHostResolver() {
     scoped_host_resolver_proc_.reset();
     host_resolver_proc_ = NULL;
   }
 
   scoped_ptr<chrome::ChromeContentClient> content_client_;
   // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
 #if !defined(OS_IOS)
   scoped_ptr<chrome::ChromeContentBrowserClient> browser_content_client_;
+  scoped_ptr<chrome::ChromeContentUtilityClient> utility_content_client_;
 #endif
 
   scoped_refptr<LocalHostResolverProc> host_resolver_proc_;
   scoped_ptr<net::ScopedDefaultHostResolverProc> scoped_host_resolver_proc_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeTestSuiteInitializer);
 };
 
 }  // namespace
 
@@ skipping 99 matching lines @@
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   base::mac::SetOverrideFrameworkBundle(NULL);
 #endif
 
   base::StatsTable::set_current(NULL);
   stats_table_.reset();
   RemoveSharedMemoryFile(stats_filename_);
 
   base::TestSuite::Shutdown();
 }