Revert r37535.

There was no LGTM, and there was still open discussion in the code review.  See
http://codereview.chromium.org/554119.  This was not ready to land.

TBR=pkasting
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/553154

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37556 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 9 deletions

diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 978960e..b0204ce 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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.
 
@@ -35,7 +35,6 @@ class URLRequestContext :
   URLRequestContext()
       : http_transaction_factory_(NULL),
         ftp_transaction_factory_(NULL),
-        cookie_policy_(NULL),
         cookie_store_(NULL),
         transport_security_state_(NULL) {
   }
@@ -68,12 +67,7 @@ class URLRequestContext :
   net::CookieStore* cookie_store() { return cookie_store_.get(); }
 
   // Gets the cookie policy for this context.
-  net::CookiePolicy* cookie_policy() const {
-    return cookie_policy_;
-  }
-  void set_cookie_policy(net::CookiePolicy* cookie_policy) {
-    cookie_policy_ = cookie_policy;
-  }
+  net::CookiePolicy* cookie_policy() { return &cookie_policy_; }
 
   net::TransportSecurityState* transport_security_state() {
       return transport_security_state_; }
@@ -137,8 +131,8 @@ class URLRequestContext :
   scoped_refptr<net::SSLConfigService> ssl_config_service_;
   net::HttpTransactionFactory* http_transaction_factory_;
   net::FtpTransactionFactory* ftp_transaction_factory_;
-  net::CookiePolicy* cookie_policy_;
   scoped_refptr<net::CookieStore> cookie_store_;
+  net::CookiePolicy cookie_policy_;
   scoped_refptr<net::TransportSecurityState> transport_security_state_;
   net::FtpAuthCache ftp_auth_cache_;
   std::string accept_language_;