Content-Dispositon handling fix #2. Still WiP. Uploading as a check point....

chrome/common/resource_dispatcher.cc

Index: chrome/common/resource_dispatcher.cc
===================================================================
--- chrome/common/resource_dispatcher.cc	(revision 15413)
+++ chrome/common/resource_dispatcher.cc	(working copy)
@@ -56,7 +56,8 @@
                           ResourceType::Type resource_type,
                           uint32 request_context,
                           int app_cache_context_id,
-                          int route_id);
+                          int route_id,
+                          const std::string& disposition_fallback_charset);
   virtual ~IPCResourceLoaderBridge();
 
   // ResourceLoaderBridge
@@ -110,7 +111,8 @@
     ResourceType::Type resource_type,
     uint32 request_context,
     int app_cache_context_id,
-    int route_id)
+    int route_id,
+    const std::string& disposition_fallback_charset)
     : peer_(NULL),
       dispatcher_(dispatcher),
       request_id_(-1),
@@ -128,6 +130,7 @@
   request_.resource_type = resource_type;
   request_.request_context = request_context;
   request_.app_cache_context_id = app_cache_context_id;
+  request_.disposition_fallback_charset = disposition_fallback_charset;
 
 #ifdef LOG_RESOURCE_REQUESTS
   url_ = url.possibly_invalid_spec();
@@ -531,7 +534,8 @@
     ResourceType::Type resource_type,
     uint32 request_context,
     int app_cache_context_id,
-    int route_id) {
+    int route_id,
+    const std::string& disposition_fallback_charset) {
   return new webkit_glue::IPCResourceLoaderBridge(this, method, url, policy_url,
                                                   referrer, frame_origin,
                                                   main_frame_origin, headers,
@@ -539,7 +543,8 @@
                                                   resource_type,
                                                   request_context,
                                                   app_cache_context_id,
-                                                  route_id);
+                                                  route_id,
+                                                  disposition_fallback_charset);
 }
 
 bool ResourceDispatcher::IsResourceDispatcherMessage(