Remove support for filtering by MIME-type.

Also merge kDontSendCookies and kDontStoreCookies to kNoCookies.

BUG=16932
TEST=unit_tests

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

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

1 files changed, 4 insertions, 4 deletions

diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 93f6b5b..4b665be 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -647,8 +647,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
 
   URLRequestContext* context = request_->context();
   if (context) {
-    if (context->AllowSendingCookies(request_))
-      request_info_.extra_headers += AssembleRequestCookies();
+    request_info_.extra_headers += AssembleRequestCookies();
 
     // Only add default Accept-Language and Accept-Charset if the request
     // didn't have them specified.
@@ -675,7 +674,8 @@ std::string URLRequestHttpJob::AssembleRequestCookies() {
       options.set_include_httponly();
       std::string cookies = request_->context()->cookie_store()->
           GetCookiesWithOptions(request_->url(), options);
-      if (!cookies.empty())
+      if (context->InterceptRequestCookies(request_, cookies) &&
+          !cookies.empty())
         return "Cookie: " + cookies + "\r\n";
     }
   }
@@ -691,7 +691,7 @@ void URLRequestHttpJob::FetchResponseCookies() {
 
   void* iter = NULL;
   while (response_info_->headers->EnumerateHeader(&iter, name, &value))
-    if (request_->context()->InterceptCookie(request_, &value))
+    if (request_->context()->InterceptResponseCookie(request_, value))
       response_cookies_.push_back(value);
 }