Remove experimental support for MAC cookies

net/url_request/url_request_http_job.cc

 // 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.
 
 #include "net/url_request/url_request_http_job.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
 #include "net/base/filter.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/network_delegate.h"
 #include "net/base/sdch_manager.h"
 #include "net/base/ssl_cert_request_info.h"
 #include "net/base/ssl_config_service.h"
-#include "net/http/http_mac_signature.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_status_code.h"
 #include "net/http/http_transaction.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/http/http_util.h"
 #include "net/url_request/fraudulent_certificate_reporter.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_redirect_job.h"
 #include "net/url_request/url_request_throttler_header_adapter.h"
 #include "net/url_request/url_request_throttler_manager.h"
 
 static const char kAvailDictionaryHeader[] = "Avail-Dictionary";
 
 namespace net {
 
-namespace {
-
-void AddAuthorizationHeader(
-    const std::vector<CookieStore::CookieInfo>& cookie_infos,
-    HttpRequestInfo* request_info) {
-  const GURL& url = request_info->url;
-  const std::string& method = request_info->method;
-  std::string request_uri = HttpUtil::PathForRequest(url);
-  const std::string& host = url.host();
-  int port = url.EffectiveIntPort();
-  for (size_t i = 0; i < cookie_infos.size(); ++i) {
-    HttpMacSignature signature;
-    if (!signature.AddStateInfo(cookie_infos[i].name,
-                                cookie_infos[i].creation_date,
-                                cookie_infos[i].mac_key,
-                                cookie_infos[i].mac_algorithm)) {
-      continue;
-    }
-    if (!signature.AddHttpInfo(method, request_uri, host, port))
-      continue;
-    std::string authorization_header;
-    if (!signature.GenerateAuthorizationHeader(&authorization_header))
-      continue;
-    request_info->extra_headers.SetHeader(HttpRequestHeaders::kAuthorization,
-                                          authorization_header);
-    return;  // Only add the first valid header.
-  }
-}
-
-}  // namespace
-
 class URLRequestHttpJob::HttpFilterContext : public FilterContext {
  public:
   explicit HttpFilterContext(URLRequestHttpJob* job);
   virtual ~HttpFilterContext();
 
   // FilterContext implementation.
   virtual bool GetMimeType(std::string* mime_type) const;
   virtual bool GetURL(GURL* gurl) const;
   virtual base::Time GetRequestTime() const;
   virtual bool IsCachedContent() const;
@@ skipping 409 matching lines @@
     DoStartTransaction();
 }
 
 void URLRequestHttpJob::OnCookiesLoaded(
     const std::string& cookie_line,
     const std::vector<net::CookieStore::CookieInfo>& cookie_infos) {
   if (!cookie_line.empty()) {
     request_info_.extra_headers.SetHeader(
         HttpRequestHeaders::kCookie, cookie_line);
   }
-  if (URLRequest::AreMacCookiesEnabled())
-    AddAuthorizationHeader(cookie_infos, &request_info_);
   DoStartTransaction();
 }
 
 void URLRequestHttpJob::DoStartTransaction() {
   // We may have been canceled while retrieving cookies.
   if (GetStatus().is_success()) {
     StartTransaction();
   } else {
     NotifyCanceled();
   }
@@ skipping 919 matching lines @@
   return override_response_headers_.get() ?
       override_response_headers_ :
       transaction_->GetResponseInfo()->headers;
 }
 
 void URLRequestHttpJob::NotifyURLRequestDestroyed() {
   awaiting_callback_ = false;
 }
 
 }  // namespace net