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

2 files changed, 1 insertions, 4 deletions

diff --git a/chrome/renderer/media/data_source_impl.cc b/chrome/renderer/media/data_source_impl.cc
index 20aee22..4046f83 100644
--- a/chrome/renderer/media/data_source_impl.cc
+++ b/chrome/renderer/media/data_source_impl.cc
@@ -209,7 +209,6 @@ void DataSourceImpl::OnInitialize(std::string uri) {
       "null",         // TODO(abarth): provide frame_origin
       "null",         // TODO(abarth): provide main_frame_origin
       std::string(),  // Provide no header.
-      "",             // default_mime_type
       // Prefer to load from cache, also enable downloading the file, the
       // resource will be saved to a single response data file if it's possible.
       net::LOAD_PREFERRING_CACHE | net::LOAD_ENABLE_DOWNLOAD_FILE,
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index d072dce..68f4fce 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -228,7 +228,6 @@ ResourceLoaderBridge* ResourceLoaderBridge::Create(
     const std::string& frame_origin,
     const std::string& main_frame_origin,
     const std::string& headers,
-    const std::string& default_mime_type,
     int load_flags,
     int origin_pid,
     ResourceType::Type resource_type,
@@ -237,8 +236,7 @@ ResourceLoaderBridge* ResourceLoaderBridge::Create(
   ResourceDispatcher* dispatch = RenderThread::current()->resource_dispatcher();
   return dispatch->CreateBridge(method, url, policy_url, referrer,
                                 frame_origin, main_frame_origin, headers,
-                                default_mime_type, load_flags, origin_pid,
-                                resource_type, 0,
+                                load_flags, origin_pid, resource_type, 0,
                                 app_cache_context_id, routing_id);
 }