Revert 12739, 12740, and 12741 because we're going to fix Issue 7448 purely in WebKit.

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

3 files changed, 0 insertions, 18 deletions

diff --git a/chrome/browser/renderer_host/buffered_resource_handler.cc b/chrome/browser/renderer_host/buffered_resource_handler.cc
index 3418666..e8a86ee 100644
--- a/chrome/browser/renderer_host/buffered_resource_handler.cc
+++ b/chrome/browser/renderer_host/buffered_resource_handler.cc
@@ -180,11 +180,6 @@ bool BufferedResourceHandler::ShouldBuffer(const GURL& url,
 
 bool BufferedResourceHandler::KeepBuffering(int bytes_read) {
   DCHECK(read_buffer_);
-
-  ResourceDispatcherHost::ExtraRequestInfo* info =
-      ResourceDispatcherHost::ExtraInfoForRequest(request_);
-  DCHECK(info);
-
   if (my_buffer_) {
     // We are using our own buffer to read, update the main buffer.
     CHECK(bytes_read + bytes_read_ < read_buffer_size_);
@@ -198,9 +193,6 @@ bool BufferedResourceHandler::KeepBuffering(int bytes_read) {
     std::string type_hint, new_type;
     request_->GetMimeType(&type_hint);
 
-    if (type_hint.empty())
-      type_hint = info->default_mime_type;
-
     if (!net::SniffMimeType(read_buffer_->data(), bytes_read_,
                             request_->url(), type_hint, &new_type)) {
       // SniffMimeType() returns false if there is not enough data to determine
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index 2cb0431..917cc5b 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -397,7 +397,6 @@ void ResourceDispatcherHost::BeginRequest(
                            request_id,
                            request_data.frame_origin,
                            request_data.main_frame_origin,
-                           request_data.default_mime_type,
                            request_data.resource_type,
                            upload_size);
   extra_info->allow_download =
@@ -534,7 +533,6 @@ void ResourceDispatcherHost::BeginDownload(const GURL& url,
                            request_id_,
                            "null",  // frame_origin
                            "null",  // main_frame_origin
-                           "", // default_mime_type
                            ResourceType::SUB_RESOURCE,
                            0 /* upload_size */);
   extra_info->allow_download = true;
@@ -589,7 +587,6 @@ void ResourceDispatcherHost::BeginSaveFile(const GURL& url,
                            request_id_,
                            "null",  // frame_origin
                            "null",  // main_frame_origin
-                           "", // default_mime_type
                            ResourceType::SUB_RESOURCE,
                            0 /* upload_size */);
   // Just saving some resources we need, disallow downloading.
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.h b/chrome/browser/renderer_host/resource_dispatcher_host.h
index 07c532c..052c157 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.h
@@ -79,7 +79,6 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
                      int request_id,
                      std::string frame_origin,
                      std::string main_frame_origin,
-                     std::string default_mime_type,
                      ResourceType::Type resource_type,
                      uint64 upload_size)
         : resource_handler(handler),
@@ -94,7 +93,6 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
           pause_count(0),
           frame_origin(frame_origin),
           main_frame_origin(main_frame_origin),
-          default_mime_type(default_mime_type),
           resource_type(resource_type),
           filter_policy(FilterPolicy::DONT_FILTER),
           last_load_state(net::LOAD_STATE_IDLE),
@@ -143,11 +141,6 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
     // this request.
     std::string main_frame_origin;
 
-    // The MIME type to use if this request lacks a Content-Type response
-    // header.  If |default_mime_type| is "", then use the default sniffing
-    // algorithm.
-    std::string default_mime_type;
-
     ResourceType::Type resource_type;
 
     // Whether the content for this request should be filtered (on the renderer