Make all drag sources not depend on download_util.

chrome/browser/ui/cocoa/tab_contents/web_drag_source.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/tab_contents/web_drag_source.h"
 
 #include <sys/param.h>
 
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/download/download_util.h"
 #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
 #include "content/browser/download/drag_download_file.h"
 #include "content/browser/download/drag_download_util.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_util.h"
 #include "ui/gfx/mac/nsimage_cache.h"
 #include "webkit/glue/webdropdata.h"
 
 using base::SysNSStringToUTF8;
 using base::SysUTF8ToNSString;
 using base::SysUTF16ToNSString;
 using net::FileStream;
@@ skipping 362 matching lines @@
       fileExtension = (dropData_->file_extension.length() > 0) ?
           SysUTF16ToNSString(dropData_->file_extension.substr(1)) : @"";
     } else {
       string16 mimeType;
       FilePath fileName;
       if (drag_download_util::ParseDownloadMetadata(
               dropData_->download_metadata,
               &mimeType,
               &fileName,
               &downloadURL_)) {
-        download_util::GenerateFileNameFromSuggestedName(
-            downloadURL_,
-            fileName.value(),
-            UTF16ToUTF8(mimeType),
-            &downloadFileName_);
+        // Generate the file name based on both mime type and proposed file
+        // name.
+        std::string defaultName =
+            content::GetContentClient()->browser()->GetDefaultDownloadName();
+        downloadFileName_ =
+            net::GenerateFileName(downloadURL_,
+                                  std::string(),
+                                  std::string(),
+                                  fileName.value(),
+                                  UTF16ToUTF8(mimeType),
+                                  defaultName);
         fileExtension = SysUTF8ToNSString(downloadFileName_.Extension());
       }
     }
 
     if (fileExtension) {
       // File contents (with and without specific type), file (HFS) promise,
       // TIFF.
       // TODO(viettrungluu): others?
       [pasteboard_ addTypes:[NSArray arrayWithObjects:
                                   NSFileContentsPboardType,
@@ skipping 17 matching lines @@
 
 - (NSImage*)dragImage {
   if (dragImage_)
     return dragImage_;
 
   // Default to returning a generic image.
   return gfx::GetCachedImageWithName(@"nav.pdf");
 }
 
 @end  // @implementation WebDragSource (Private)