Always make an attempt to fill in the suggested filename.

webkit/glue/weburlloader_impl.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.
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
 #include "webkit/glue/weburlloader_impl.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 227 matching lines @@
   else if (headers->GetHttpVersion() == net::HttpVersion(1, 1))
     version = WebURLResponse::HTTP_1_1;
   response->setHTTPVersion(version);
   response->setHTTPStatusCode(headers->response_code());
   response->setHTTPStatusText(WebString::fromUTF8(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(
-        net::GetSuggestedFilename(url, value, "", "", "", std::string()));
-  }
+  std::string disposition_filename;
+  headers->EnumerateHeader(NULL, "content-disposition", &disposition_filename);
+  response->setSuggestedFileName(
+      net::GetSuggestedFilename(url,
+                                disposition_filename,
+                                std::string(),  // referrer_charset
+                                std::string(),  // suggested_name
+                                std::string(),  // mime_type
+                                std::string()));  // default_name
 
   Time time_val;
   if (headers->GetLastModifiedValue(&time_val))
     response->setLastModifiedDate(time_val.ToDoubleT());
 
   // Build up the header map.
   void* iter = NULL;
   std::string name;
-  while (headers->EnumerateHeaderLines(&iter, &name, &value)) {
+  while (headers->EnumerateHeaderLines(&iter, &name, &disposition_filename)) {

[darin (slow to review), 2013/01/07 23:05:03]

nit: This is an awkward use of the variable named disposition_filename.  |value|
was generic, so it worked in both cases.  Here, we are enumerating response
headers, and you are assigning the value of a header to the variable named
disposition_filename, which is confusing.  I'm guessing you just did a
search-n-replace of |value| to |disposition_filename|.

[Avi (use Gerrit), 2013/01/07 23:08:26]

I actually didn't see this second use of |value| :O. Will switch back.

     response->addHTTPHeaderField(WebString::fromUTF8(name),
-                                 WebString::fromUTF8(value));
+                                 WebString::fromUTF8(disposition_filename));
   }
 }
 
 }  // namespace
 
 // WebURLLoaderImpl::Context --------------------------------------------------
 
 // This inner class exists since the WebURLLoader may be deleted while inside a
 // call to WebURLLoaderClient.  The bridge requires its Peer to stay alive
 // until it receives OnCompletedRequest.
@@ skipping 498 matching lines @@
 
 void WebURLLoaderImpl::cancel() {
   context_->Cancel();
 }
 
 void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
 }  // namespace webkit_glue