Clean up download code:

chrome/browser/cocoa/web_drag_source.mm

 // Copyright (c) 2009 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/cocoa/web_drag_source.h"
 
 #include "base/file_path.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
+#include "chrome/browser/download/download_util.h"
 #include "chrome/browser/download/drag_download_file.h"
 #include "chrome/browser/download/drag_download_util.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_util.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "webkit/glue/webdropdata.h"
 
@@ skipping 334 matching lines @@
     } else {
       string16 mimeType;
       FilePath fileName;
       if (drag_download_util::ParseDownloadMetadata(
               dropData_->download_metadata,
               &mimeType,
               &fileName,
               &downloadURL_)) {
         std::string contentDisposition =
             "attachment; filename=" + fileName.value();
-        DownloadManager::GenerateFileName(downloadURL_,
-                                          contentDisposition,
-                                          std::string(),
-                                          UTF16ToUTF8(mimeType),
-                                          &downloadFileName_);
+        download_util::GenerateFileName(downloadURL_,
+                                        contentDisposition,
+                                        std::string(),
+                                        UTF16ToUTF8(mimeType),
+                                        &downloadFileName_);
         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 nsimage_cache::ImageNamed(@"nav.pdf");
 }
 
 @end  // @implementation WebDragSource (Private)