diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 00:17:51 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 00:17:51 +0000 |
| commit | 7a28f1690831eeb3c33d259a7bad9e676ce41ed7 (patch) | |
| tree | ed209f5a4e14a6882b5f947478cca7e44e796220 | |
| parent | ca49bcfa3d8e655597a63e018dda670d5586bff7 (diff) | |
| download | chromium_src-7a28f1690831eeb3c33d259a7bad9e676ce41ed7.zip chromium_src-7a28f1690831eeb3c33d259a7bad9e676ce41ed7.tar.gz chromium_src-7a28f1690831eeb3c33d259a7bad9e676ce41ed7.tar.bz2 | |
Simple fix so the utility process respects single process mode.
BUG=24746
Review URL: http://codereview.chromium.org/339033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30289 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/web_resource/web_resource_service.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 7e56c9f..fc93f0d 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/web_resource/web_resource_service.h" +#include "base/command_line.h" #include "base/string_util.h" #include "base/time.h" #include "base/values.h" @@ -10,6 +11,7 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/browser/profile.h" #include "chrome/browser/net/url_fetcher.h" +#include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" @@ -106,7 +108,8 @@ class WebResourceService::UnpackerClient // If we don't have a resource_dispatcher_host_, assume we're in // a test and run the unpacker directly in-process. bool use_utility_process = - web_resource_service_->resource_dispatcher_host_ != NULL; + web_resource_service_->resource_dispatcher_host_ != NULL && + !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess); #if defined(OS_POSIX) // TODO(port): Don't use a utility process on linux (crbug.com/22703) or |