Push one function from the Mac drag/drop util code to ui/.

chrome/browser/ui/cocoa/tab_contents/web_drop_target.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_drop_target.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/cocoa/drag_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
+#import "ui/base/dragdrop/cocoa_dnd_util.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/window_open_disposition.h"
 
 using WebKit::WebDragOperationsMask;
 
 @implementation WebDropTarget
 
 // |contents| is the TabContents representing this tab, used to communicate
 // drag&drop messages to WebCore and handle navigation on a successful drop
 // (if necessary).
@@ skipping 133 matching lines @@
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info
                               view:(NSView*)view {
   if (currentRVH_ != tabContents_->render_view_host())
     [self draggingEntered:info view:view];
 
   // Check if we only allow navigation and navigate to a url on the pasteboard.
   if ([self onlyAllowsNavigation]) {
     NSPasteboard* pboard = [info draggingPasteboard];
     if ([pboard containsURLData]) {
       GURL url;
-      drag_util::PopulateURLAndTitleFromPasteBoard(&url, NULL, pboard, YES);
+      ui::PopulateURLAndTitleFromPasteboard(&url, NULL, pboard, YES);
       tabContents_->OpenURL(url, GURL(), CURRENT_TAB,
                             content::PAGE_TRANSITION_AUTO_BOOKMARK);
       return YES;
     }
     return NO;
   }
 
   // If the tab is showing the bookmark manager, send BookmarkDrag events
   BookmarkTabHelper::BookmarkDrag* dragDelegate =
       tab_ ? tab_->bookmark_tab_helper()->GetBookmarkDragDelegate() : NULL;
@@ skipping 24 matching lines @@
 // Given |data|, which should not be nil, fill it in using the contents of the
 // given pasteboard.
 - (void)populateWebDropData:(WebDropData*)data
              fromPasteboard:(NSPasteboard*)pboard {
   DCHECK(data);
   DCHECK(pboard);
   NSArray* types = [pboard types];
 
   // Get URL if possible. To avoid exposing file system paths to web content,
   // filenames in the drag are not converted to file URLs.
-  drag_util::PopulateURLAndTitleFromPasteBoard(&data->url,
-                                               &data->url_title,
-                                               pboard,
-                                               NO);
+  ui::PopulateURLAndTitleFromPasteboard(&data->url,
+                                        &data->url_title,
+                                        pboard,
+                                        NO);
 
   // Get plain text.
   if ([types containsObject:NSStringPboardType]) {
     data->plain_text =
         base::SysNSStringToUTF16([pboard stringForType:NSStringPboardType]);
   }
 
   // Get HTML. If there's no HTML, try RTF.
   if ([types containsObject:NSHTMLPboardType]) {
     data->text_html =
@@ skipping 15 matching lines @@
         if (exists && !isDir)
           data->filenames.push_back(base::SysNSStringToUTF16(filename));
       }
     }
   }
 
   // TODO(pinkerton): Get file contents. http://crbug.com/34661
 }
 
 @end