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

chrome/browser/ui/cocoa/tab_contents/web_drop_target_unittest.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.
 
 #include "base/mac/scoped_nsautorelease_pool.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/drag_util.h"
 #import "chrome/browser/ui/cocoa/tab_contents/web_drop_target.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
+#import "ui/base/dragdrop/cocoa_dnd_util.h"
 #include "webkit/glue/webdropdata.h"
 
 class WebDropTargetTest : public ChromeRenderViewHostTestHarness {
  public:
   virtual void SetUp() {
     ChromeRenderViewHostTestHarness::SetUp();
     CocoaTest::BootstrapCocoa();
     drop_target_.reset([[WebDropTarget alloc] initWithTabContents:contents()]);
   }
 
@@ skipping 49 matching lines @@
   NSPasteboard* pboard = nil;
   NSString* url = nil;
   NSString* title = nil;
   GURL result_url;
   string16 result_title;
 
   // Put a URL on the pasteboard and check it.
   pboard = [NSPasteboard pasteboardWithUniqueName];
   url = @"http://www.google.com/";
   PutURLOnPasteboard(url, pboard);
-  EXPECT_TRUE(drag_util::PopulateURLAndTitleFromPasteBoard(
+  EXPECT_TRUE(ui::PopulateURLAndTitleFromPasteboard(
       &result_url, &result_title, pboard, NO));
   EXPECT_EQ(base::SysNSStringToUTF8(url), result_url.spec());
   [pboard releaseGlobally];
 
   // Put a 'url ' and 'urln' on the pasteboard and check it.
   pboard = [NSPasteboard pasteboardWithUniqueName];
   url = @"http://www.google.com/";
   title = @"Title of Awesomeness!",
   PutCoreURLAndTitleOnPasteboard(url, title, pboard);
-  EXPECT_TRUE(drag_util::PopulateURLAndTitleFromPasteBoard(
+  EXPECT_TRUE(ui::PopulateURLAndTitleFromPasteboard(
       &result_url, &result_title, pboard, NO));
   EXPECT_EQ(base::SysNSStringToUTF8(url), result_url.spec());
   EXPECT_EQ(base::SysNSStringToUTF16(title), result_title);
   [pboard releaseGlobally];
 
   // Also check that it passes file:// via 'url '/'urln' properly.
   pboard = [NSPasteboard pasteboardWithUniqueName];
   url = @"file:///tmp/dont_delete_me.txt";
   title = @"very important";
   PutCoreURLAndTitleOnPasteboard(url, title, pboard);
-  EXPECT_TRUE(drag_util::PopulateURLAndTitleFromPasteBoard(
+  EXPECT_TRUE(ui::PopulateURLAndTitleFromPasteboard(
       &result_url, &result_title, pboard, NO));
   EXPECT_EQ(base::SysNSStringToUTF8(url), result_url.spec());
   EXPECT_EQ(base::SysNSStringToUTF16(title), result_title);
   [pboard releaseGlobally];
 
   // And javascript:.
   pboard = [NSPasteboard pasteboardWithUniqueName];
   url = @"javascript:open('http://www.youtube.com/')";
   title = @"kill some time";
   PutCoreURLAndTitleOnPasteboard(url, title, pboard);
-  EXPECT_TRUE(drag_util::PopulateURLAndTitleFromPasteBoard(
+  EXPECT_TRUE(ui::PopulateURLAndTitleFromPasteboard(
       &result_url, &result_title, pboard, NO));
   EXPECT_EQ(base::SysNSStringToUTF8(url), result_url.spec());
   EXPECT_EQ(base::SysNSStringToUTF16(title), result_title);
   [pboard releaseGlobally];
 
   pboard = [NSPasteboard pasteboardWithUniqueName];
   url = @"/bin/sh";
   [pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType]
                  owner:nil];
   [pboard setPropertyList:[NSArray arrayWithObject:url]
                   forType:NSFilenamesPboardType];
-  EXPECT_FALSE(drag_util::PopulateURLAndTitleFromPasteBoard(
+  EXPECT_FALSE(ui::PopulateURLAndTitleFromPasteboard(
       &result_url, &result_title, pboard, NO));
-  EXPECT_TRUE(drag_util::PopulateURLAndTitleFromPasteBoard(
+  EXPECT_TRUE(ui::PopulateURLAndTitleFromPasteboard(
       &result_url, &result_title, pboard, YES));
   EXPECT_EQ("file://localhost/bin/sh", result_url.spec());
   EXPECT_EQ("sh", UTF16ToUTF8(result_title));
   [pboard releaseGlobally];
 }
 
 TEST_F(WebDropTargetTest, Data) {
   WebDropData data;
   NSPasteboard* pboard = [NSPasteboard pasteboardWithUniqueName];
 
   PutURLOnPasteboard(@"http://www.google.com", pboard);
   [pboard addTypes:[NSArray arrayWithObjects:NSHTMLPboardType,
                               NSStringPboardType, nil]
              owner:nil];
   NSString* htmlString = @"<html><body><b>hi there</b></body></html>";
   NSString* textString = @"hi there";
   [pboard setString:htmlString forType:NSHTMLPboardType];
   [pboard setString:textString forType:NSStringPboardType];
   [drop_target_ populateWebDropData:&data fromPasteboard:pboard];
   EXPECT_EQ(data.url.spec(), "http://www.google.com/");
   EXPECT_EQ(base::SysNSStringToUTF16(textString), data.plain_text);
   EXPECT_EQ(base::SysNSStringToUTF16(htmlString), data.text_html);
 
   [pboard releaseGlobally];
 }