summaryrefslogtreecommitdiffstats
path: root/chrome/service
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-04 09:37:20 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-04 09:37:20 +0000
commit53d270ef9d6336a8d2f4b70008121c4aee142a13 (patch)
treedd98b08e398d9ce8bf210351cc73c28451982ccd /chrome/service
parentb0cad5d48859e6fb30f2d46bdf5f0aa1a6fa73d5 (diff)
downloadchromium_src-53d270ef9d6336a8d2f4b70008121c4aee142a13.zip
chromium_src-53d270ef9d6336a8d2f4b70008121c4aee142a13.tar.gz
chromium_src-53d270ef9d6336a8d2f4b70008121c4aee142a13.tar.bz2
Revert 130578 - 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 TBR=jochen@chromium.org Review URL: https://chromiumcodereview.appspot.com/9956142 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
-rw-r--r--chrome/service/service_main.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/service/service_main.cc b/chrome/service/service_main.cc
index d85134a..bcde1ba 100644
--- a/chrome/service/service_main.cc
+++ b/chrome/service/service_main.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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,7 +8,6 @@
#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"
@@ -19,10 +18,6 @@
// 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