Pass cookie options to content settings delegate.

BUG=63650
TEST=unit tests

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

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

4 files changed, 6 insertions, 0 deletions

diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 7898848..ac54a1f 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -89,6 +89,7 @@ void URLRequest::Delegate::OnGetCookies(URLRequest* request,
 
 void URLRequest::Delegate::OnSetCookie(URLRequest* request,
                                        const std::string& cookie_line,
+                                       const net::CookieOptions& options,
                                        bool blocked_by_policy) {
 }
 
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 66c0aa9..01df25b 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -29,6 +29,7 @@ class Time;
 }  // namespace base
 
 namespace net {
+class CookieOptions;
 class IOBuffer;
 class SSLCertRequestInfo;
 class UploadData;
@@ -187,6 +188,7 @@ class URLRequest : public NonThreadSafe {
     // when LOAD_DO_NOT_SAVE_COOKIES is specified.
     virtual void OnSetCookie(URLRequest* request,
                              const std::string& cookie_line,
+                             const net::CookieOptions& options,
                              bool blocked_by_policy);
 
     // After calling Start(), the delegate will receive an OnResponseStarted
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 826f635..bbb229b 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -475,6 +475,7 @@ void URLRequestHttpJob::OnCanSetCookieCompleted(int policy) {
       request_->delegate()->OnSetCookie(
           request_,
           response_cookies_[response_cookies_save_index_],
+          net::CookieOptions(),
           true);
     } else if ((policy == net::OK || policy == net::OK_FOR_SESSION_ONLY) &&
                request_->context()->cookie_store()) {
@@ -489,6 +490,7 @@ void URLRequestHttpJob::OnCanSetCookieCompleted(int policy) {
       request_->delegate()->OnSetCookie(
           request_,
           response_cookies_[response_cookies_save_index_],
+          options,
           false);
     }
     response_cookies_save_index_++;
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index 378b133..af8f49e 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -319,6 +319,7 @@ class TestDelegate : public URLRequest::Delegate {
 
   virtual void OnSetCookie(URLRequest* request,
                            const std::string& cookie_line,
+                           const net::CookieOptions& options,
                            bool blocked_by_policy) {
     if (blocked_by_policy) {
       blocked_set_cookie_count_++;