Revert WebURLLoader landing. Too many layout test failures.

TBR=dglazkov

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

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

1 files changed, 0 insertions, 502 deletions

diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
deleted file mode 100644
index da9d2747..0000000
--- a/webkit/glue/weburlloader_impl.cc
+++ /dev/null
@@ -1,502 +0,0 @@
-// Copyright (c) 2006-2009 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.
-
-// An implementation of WebURLLoader in terms of ResourceLoaderBridge.
-
-#include "webkit/glue/weburlloader_impl.h"
-
-#include "base/message_loop.h"
-#include "base/process_util.h"
-#include "base/string_util.h"
-#include "base/time.h"
-#include "net/base/data_url.h"
-#include "net/base/load_flags.h"
-#include "net/base/net_errors.h"
-#include "net/base/net_util.h"
-#include "net/http/http_response_headers.h"
-#include "webkit/api/public/WebHTTPHeaderVisitor.h"
-#include "webkit/api/public/WebURL.h"
-#include "webkit/api/public/WebURLError.h"
-#include "webkit/api/public/WebURLLoaderClient.h"
-#include "webkit/api/public/WebURLRequest.h"
-#include "webkit/api/public/WebURLResponse.h"
-#include "webkit/glue/glue_util.h"
-#include "webkit/glue/webkit_glue.h"
-
-using base::Time;
-using base::TimeDelta;
-using WebKit::WebData;
-using WebKit::WebHTTPBody;
-using WebKit::WebHTTPHeaderVisitor;
-using WebKit::WebString;
-using WebKit::WebURLError;
-using WebKit::WebURLLoader;
-using WebKit::WebURLLoaderClient;
-using WebKit::WebURLRequest;
-using WebKit::WebURLResponse;
-
-namespace webkit_glue {
-
-namespace {
-
-class HeaderFlattener : public WebHTTPHeaderVisitor {
- public:
-  explicit HeaderFlattener(int load_flags)
-      : load_flags_(load_flags),
-        has_accept_header_(false) {
-  }
-
-  virtual void visitHeader(const WebString& name, const WebString& value) {
-    // TODO(darin): is UTF-8 really correct here?  It is if the strings are
-    // already ASCII (i.e., if they are already escaped properly).
-    const std::string& name_utf8 = WebStringToStdString(name);
-    const std::string& value_utf8 = WebStringToStdString(value);
-    
-    // Skip over referrer headers found in the header map because we already
-    // pulled it out as a separate parameter.  We likewise prune the UA since
-    // that will be added back by the network layer.
-    if (LowerCaseEqualsASCII(name_utf8, "referer") ||
-        LowerCaseEqualsASCII(name_utf8, "user-agent"))
-      return;
-
-    // Skip over "Cache-Control: max-age=0" header if the corresponding
-    // load flag is already specified. FrameLoader sets both the flag and
-    // the extra header -- the extra header is redundant since our network
-    // implementation will add the necessary headers based on load flags.
-    // See http://code.google.com/p/chromium/issues/detail?id=3434.
-    if ((load_flags_ & net::LOAD_VALIDATE_CACHE) &&
-        LowerCaseEqualsASCII(name_utf8, "cache-control") &&
-        LowerCaseEqualsASCII(value_utf8, "max-age=0"))
-      return;
-
-    if (LowerCaseEqualsASCII(name_utf8, "accept"))
-      has_accept_header_ = true;
-
-    if (!buffer_.empty())
-      buffer_.append("\r\n");
-    buffer_.append(name_utf8 + ": " + value_utf8);
-  }
-
-  const std::string& GetBuffer() {
-    // In some cases, WebKit doesn't add an Accept header, but not having the
-    // header confuses some web servers.  See bug 808613.
-    if (!has_accept_header_) {
-      if (!buffer_.empty())
-        buffer_.append("\r\n");
-      buffer_.append("Accept: */*");
-      has_accept_header_ = true;
-    }
-    return buffer_;
-  }
-
- private:
-  int load_flags_;
-  std::string buffer_;
-  bool has_accept_header_;
-};
-
-ResourceType::Type FromTargetType(WebURLRequest::TargetType type) {
-  switch (type) {
-    case WebURLRequest::TargetIsMainFrame:
-      return ResourceType::MAIN_FRAME;
-    case WebURLRequest::TargetIsSubFrame:
-      return ResourceType::SUB_FRAME;
-    case WebURLRequest::TargetIsSubResource:
-      return ResourceType::SUB_RESOURCE;
-    case WebURLRequest::TargetIsObject:
-      return ResourceType::OBJECT;
-    case WebURLRequest::TargetIsMedia:
-      return ResourceType::MEDIA;
-    default:
-      NOTREACHED();
-      return ResourceType::SUB_RESOURCE;
-  }
-}
-
-// Extracts the information from a data: url.
-bool GetInfoFromDataURL(const GURL& url,
-                        ResourceLoaderBridge::ResponseInfo* info,
-                        std::string* data, URLRequestStatus* status) {
-  std::string mime_type;
-  std::string charset;
-  if (net::DataURL::Parse(url, &mime_type, &charset, data)) {
-    *status = URLRequestStatus(URLRequestStatus::SUCCESS, 0);
-    info->request_time = Time::Now();
-    info->response_time = Time::Now();
-    info->headers = NULL;
-    info->mime_type.swap(mime_type);
-    info->charset.swap(charset);
-    info->security_info.clear();
-    info->content_length = -1;
-
-    return true;
-  }
-
-  *status = URLRequestStatus(URLRequestStatus::FAILED, net::ERR_INVALID_URL);
-  return false;
-}
-
-void PopulateURLResponse(
-    const GURL& url,
-    const ResourceLoaderBridge::ResponseInfo& info,
-    WebURLResponse* response) {
-  response->setURL(url);
-  response->setMIMEType(StdStringToWebString(info.mime_type));
-  response->setTextEncodingName(StdStringToWebString(info.charset));
-  response->setExpectedContentLength(info.content_length);
-  response->setSecurityInfo(info.security_info);
-  response->setAppCacheID(info.app_cache_id);
-
-  const net::HttpResponseHeaders* headers = info.headers;
-  if (!headers)
-    return;
-
-  response->setHTTPStatusCode(headers->response_code());
-  response->setHTTPStatusText(StdStringToWebString(headers->GetStatusText()));
-
-  // TODO(darin): We should leverage HttpResponseHeaders for this, and this
-  // should be using the same code as ResourceDispatcherHost.
-  // TODO(jungshik): Figure out the actual value of the referrer charset and
-  // pass it to GetSuggestedFilename.
-  std::string value;
-  if (headers->EnumerateHeader(NULL, "content-disposition", &value)) {
-    response->setSuggestedFileName(WideToUTF16Hack(
-        net::GetSuggestedFilename(url, value, "", std::wstring())));
-  }
-
-  Time time_val;
-  if (headers->GetLastModifiedValue(&time_val))
-    response->setLastModifiedDate(time_val.ToDoubleT());
-
-  // Compute expiration date
-  TimeDelta freshness_lifetime =
-      headers->GetFreshnessLifetime(info.response_time);
-  if (freshness_lifetime != TimeDelta()) {
-    Time now = Time::Now();
-    TimeDelta current_age =
-        headers->GetCurrentAge(info.request_time, info.response_time, now);
-    time_val = now + freshness_lifetime - current_age;
-
-    response->setExpirationDate(time_val.ToDoubleT());
-  } else {
-    // WebKit uses 0 as a special expiration date that means never expire.
-    // 1 is a small enough value to let it always expire.
-    response->setExpirationDate(1);
-  }
-
-  // Build up the header map.
-  void* iter = NULL;
-  std::string name;
-  while (headers->EnumerateHeaderLines(&iter, &name, &value)) {
-    response->addHTTPHeaderField(StdStringToWebString(name),
-                                 StdStringToWebString(value));
-  }
-}
-
-} // namespace
-
-WebURLLoaderImpl::WebURLLoaderImpl()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
-      client_(NULL) {
-}
-
-WebURLLoaderImpl::~WebURLLoaderImpl() {
-}
-
-void WebURLLoaderImpl::loadSynchronously(const WebURLRequest& request,
-                                         WebURLResponse& response,
-                                         WebURLError& error,
-                                         WebData& data) {
-  ResourceLoaderBridge::SyncLoadResponse sync_load_response;
-  Start(request, &sync_load_response);
-
-  const GURL& final_url = sync_load_response.url;
-
-  // TODO(tc): For file loads, we may want to include a more descriptive
-  // status code or status text.
-  const URLRequestStatus::Status& status = sync_load_response.status.status();
-  if (status != URLRequestStatus::SUCCESS &&
-      status != URLRequestStatus::HANDLED_EXTERNALLY) {
-    response.setURL(final_url);
-    error.domain = WebString::fromUTF8(net::kErrorDomain);
-    error.reason = sync_load_response.status.os_error();
-    error.unreachableURL = final_url;
-    return;
-  }
-
-  PopulateURLResponse(final_url, sync_load_response, &response);
-
-  data.assign(sync_load_response.data.data(),
-              sync_load_response.data.size());
-}
-
-void WebURLLoaderImpl::loadAsynchronously(const WebURLRequest& request,
-                                          WebURLLoaderClient* client) {
-  DCHECK(!client_);
-
-  client_ = client;
-  Start(request, NULL);
-}
-
-void WebURLLoaderImpl::cancel() {
-  // The bridge will still send OnCompletedRequest, which will deref() us,
-  // so we don't do that here.
-  if (bridge_.get())
-    bridge_->Cancel();
-
-  // Ensure that we do not notify the multipart delegate anymore as it has
-  // its own pointer to the client.
-  multipart_delegate_.reset();
-
-  // Do not make any further calls to the client.
-  client_ = NULL;
-}
-
-void WebURLLoaderImpl::setDefersLoading(bool value) {
-  if (bridge_.get())
-    bridge_->SetDefersLoading(value);
-}
-
-void WebURLLoaderImpl::OnUploadProgress(uint64 position, uint64 size) {
-  if (client_)
-    client_->didSendData(this, position, size);
-}
-
-void WebURLLoaderImpl::OnReceivedRedirect(const GURL& new_url) {
-  if (!client_)
-    return;
-
-  // TODO(darin): We lack sufficient information to construct the
-  // actual redirect response, so we just simulate it here.
-  WebURLResponse response(url_);
-  
-  // TODO(darin): We lack sufficient information to construct the
-  // actual request that resulted from the redirect, so we just
-  // report a GET navigation to the new location.
-  WebURLRequest new_request(new_url);
-
-  url_ = new_url;
-  client_->willSendRequest(this, new_request, response);
-
-  // TODO(darin): since new_request is sent as a mutable reference, it is
-  // possible that willSendRequest may have modified it.
-  //
-  // andresca on #webkit confirms that that is intentional, so we'll need
-  // to rework the ResourceLoaderBridge to give us control over what URL
-  // is really loaded (and with what headers) when a redirect is encountered.
-  // TODO(darin): we fail this assertion in some layout tests!
-  //DCHECK(GURL(new_request.url()) == new_url);
-}
-
-void WebURLLoaderImpl::OnReceivedResponse(
-    const ResourceLoaderBridge::ResponseInfo& info,
-    bool content_filtered) {
-  if (!client_)
-    return;
-
-  WebURLResponse response;
-  response.initialize();
-  PopulateURLResponse(url_, info, &response);
-  response.setIsContentFiltered(content_filtered);
-
-  expected_content_length_ = response.expectedContentLength();
-
-  client_->didReceiveResponse(this, response);
-
-  // we may have been cancelled after didReceiveResponse, which would leave us
-  // without a client and therefore without much need to do multipart handling.
-  if (!client_)
-    return;
-
-  DCHECK(!multipart_delegate_.get());
-  if (info.headers && info.mime_type == "multipart/x-mixed-replace") {
-    std::string content_type;
-    info.headers->EnumerateHeader(NULL, "content-type", &content_type);
-
-    std::string boundary = net::GetHeaderParamValue(content_type, "boundary");
-    TrimString(boundary, " \"", &boundary);
-
-    // If there's no boundary, just handle the request normally.  In the gecko
-    // code, nsMultiMixedConv::OnStartRequest throws an exception.
-    if (!boundary.empty()) {
-      multipart_delegate_.reset(
-          new MultipartResponseDelegate(client_, this, response, boundary));
-    }
-  }
-}
-
-void WebURLLoaderImpl::OnReceivedData(const char* data, int len) {
-  if (!client_)
-    return;
-
-  if (multipart_delegate_.get()) {
-    // The multipart delegate will make the appropriate calls to
-    // client_->didReceiveData and client_->didReceiveResponse.
-    multipart_delegate_->OnReceivedData(data, len);
-  } else {
-    client_->didReceiveData(this, data, len, expected_content_length_);
-  }
-}
-
-void WebURLLoaderImpl::OnCompletedRequest(const URLRequestStatus& status,
-                                          const std::string& security_info) {
-  if (multipart_delegate_.get()) {
-    multipart_delegate_->OnCompletedRequest();
-    multipart_delegate_.reset(NULL);
-  }
-
-  if (!client_)
-    return;
-
-  if (status.status() != URLRequestStatus::SUCCESS) {
-    int error_code;
-    if (status.status() == URLRequestStatus::HANDLED_EXTERNALLY) {
-      // By marking this request as aborted we insure that we don't navigate
-      // to an error page.
-      error_code = net::ERR_ABORTED;
-    } else {
-      error_code = status.os_error();
-    }
-    WebURLError error;
-    error.domain = WebString::fromUTF8(net::kErrorDomain);
-    error.reason = error_code;
-    error.unreachableURL = url_;
-    client_->didFail(this, error);
-  } else {
-    client_->didFinishLoading(this);
-  }
-}
-
-std::string WebURLLoaderImpl::GetURLForDebugging() {
-  return url_.spec();
-}
-
-void WebURLLoaderImpl::Start(
-    const WebURLRequest& request,
-    ResourceLoaderBridge::SyncLoadResponse* sync_load_response) {
-  DCHECK(!bridge_.get());
-
-  url_ = request.url();
-  if (url_.SchemeIs("data")) {
-    if (sync_load_response) {
-      // This is a sync load. Do the work now.
-      sync_load_response->url = url_;
-      std::string data;
-      GetInfoFromDataURL(sync_load_response->url, sync_load_response,
-                         &sync_load_response->data,
-                         &sync_load_response->status);
-    } else {
-      MessageLoop::current()->PostTask(FROM_HERE,
-          task_factory_.NewRunnableMethod(&WebURLLoaderImpl::HandleDataURL));
-    }
-    return;
-  }
-
-  GURL referrer_url(WebStringToStdString(
-      request.httpHeaderField(WebString::fromUTF8("Referer"))));
-  const std::string& method = WebStringToStdString(request.httpMethod());
-
-  int load_flags = net::LOAD_NORMAL;
-  switch (request.cachePolicy()) {
-    case WebURLRequest::ReloadIgnoringCacheData:
-      // Required by LayoutTests/http/tests/misc/refresh-headers.php
-      load_flags |= net::LOAD_VALIDATE_CACHE;
-      break;
-    case WebURLRequest::ReturnCacheDataElseLoad:
-      load_flags |= net::LOAD_PREFERRING_CACHE;
-      break;
-    case WebURLRequest::ReturnCacheDataDontLoad:
-      load_flags |= net::LOAD_ONLY_FROM_CACHE;
-      break;
-    case WebURLRequest::UseProtocolCachePolicy:
-      break;
-  }
-
-  if (request.reportUploadProgress())
-    load_flags |= net::LOAD_ENABLE_UPLOAD_PROGRESS;
-
-  // TODO(jcampan): in the non out-of-process plugin case the request does not
-  // have a requestor_pid. Find a better place to set this.
-  int requestor_pid = request.requestorProcessID();
-  if (requestor_pid == 0)
-    requestor_pid = base::GetCurrentProcId();
-
-  HeaderFlattener flattener(load_flags);
-  request.visitHTTPHeaderFields(&flattener);
-
-  // TODO(abarth): These are wrong!  I need to figure out how to get the right
-  //               strings here.  See: http://crbug.com/8706
-  std::string frame_origin = request.firstPartyForCookies().spec();
-  std::string main_frame_origin = request.firstPartyForCookies().spec();
-
-  // TODO(brettw) this should take parameter encoding into account when
-  // creating the GURLs.
-  bridge_.reset(ResourceLoaderBridge::Create(
-      method,
-      url_,
-      request.firstPartyForCookies(),
-      referrer_url,
-      frame_origin,
-      main_frame_origin,
-      flattener.GetBuffer(),
-      load_flags,
-      requestor_pid,
-      FromTargetType(request.targetType()),
-      request.appCacheContextID(),
-      request.requestorID()));
-
-  if (!request.httpBody().isNull()) {
-    // GET and HEAD requests shouldn't have http bodies.
-    DCHECK(method != "GET" && method != "HEAD");
-    const WebHTTPBody& httpBody = request.httpBody();
-    size_t i = 0;
-    WebHTTPBody::Element element;
-    while (httpBody.elementAt(i++, element)) {
-      switch (element.type) {
-        case WebHTTPBody::Element::TypeData:
-          if (!element.data.isEmpty()) {
-            // WebKit sometimes gives up empty data to append. These aren't
-            // necessary so we just optimize those out here.
-            bridge_->AppendDataToUpload(
-                element.data.data(), static_cast<int>(element.data.size()));
-          }
-          break;
-        case WebHTTPBody::Element::TypeFile:
-          bridge_->AppendFileToUpload(
-              FilePath(WebStringToFilePathString(element.filePath)));
-          break;
-        default:
-          NOTREACHED();
-      }
-    }
-    bridge_->SetUploadIdentifier(request.httpBody().identifier());
-  }
-
-  if (sync_load_response) {
-    bridge_->SyncLoad(sync_load_response);
-    return;
-  }
-
-  if (!bridge_->Start(this))
-    bridge_.reset();
-}
-
-void WebURLLoaderImpl::HandleDataURL() {
-  if (!client_)
-    return;
-
-  ResourceLoaderBridge::ResponseInfo info;
-  URLRequestStatus status;
-  std::string data;
-
-  if (GetInfoFromDataURL(url_, &info, &data, &status)) {
-    OnReceivedResponse(info, false);
-    if (!data.empty())
-      OnReceivedData(data.data(), data.size());
-  }
-
-  OnCompletedRequest(status, info.security_info);
-}
-
-}  // namespace webkit_glue