summaryrefslogtreecommitdiffstats
path: root/chrome/service/service_main.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-04 09:15:04 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-04 09:15:04 +0000
commitb0cad5d48859e6fb30f2d46bdf5f0aa1a6fa73d5 (patch)
tree7020f7d42fafc3f4594e0716d3badf3067e93375 /chrome/service/service_main.cc
parent017ecde96cd5f6a28b6561404360241862c041b3 (diff)
downloadchromium_src-b0cad5d48859e6fb30f2d46bdf5f0aa1a6fa73d5.zip
chromium_src-b0cad5d48859e6fb30f2d46bdf5f0aa1a6fa73d5.tar.gz
chromium_src-b0cad5d48859e6fb30f2d46bdf5f0aa1a6fa73d5.tar.bz2
Enable cookies per default in net. Add an API to disable them by default, and do that in Chrome
BUG=none TEST=existing tests shouldn't break Review URL: https://chromiumcodereview.appspot.com/9865018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service/service_main.cc')
-rw-r--r--chrome/service/service_main.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/service/service_main.cc b/chrome/service/service_main.cc
index bcde1ba..d85134a 100644
--- a/chrome/service/service_main.cc
+++ b/chrome/service/service_main.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -8,6 +8,7 @@
#include "chrome/common/service_process_util.h"
#include "chrome/service/service_process.h"
#include "content/public/common/main_function_params.h"
+#include "net/url_request/url_request.h"
#if defined(OS_WIN)
#include "content/common/sandbox_policy.h"
@@ -18,6 +19,10 @@
// Mainline routine for running as the service process.
int ServiceProcessMain(const content::MainFunctionParams& parameters) {
+ // Chrome disallows cookies by default. All code paths that want to use
+ // cookies should go through the browser process.
+ net::URLRequest::SetDefaultCookiePolicyToBlock();
+
#if defined(OS_MACOSX)
chrome_service_application_mac::RegisterServiceApp();
#endif