mac: More pasteboard fixes.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm
index dc3a67f06f1dd5cce1339386505e78254c083895..2b9befdc6f18df7a31ab6ec198035224d3a6fd97 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm
@@ -22,6 +22,7 @@
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #import "third_party/ocmock/ocmock_extensions.h"
+#include "ui/base/clipboard/clipboard_util_mac.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
@@ -80,7 +81,8 @@ class BookmarkBarFolderViewTest : public CocoaProfileTest {
 
   id GetFakePasteboardForType(NSString* dataType) {
     id pasteboard = [OCMockObject mockForClass:[NSPasteboard class]];
-    if ([dataType isEqualToString:kBookmarkButtonDragType]) {
+    if ([dataType isEqualToString:ui::ClipboardUtil::UTIForPasteboardType(
+                                      kBookmarkButtonDragType)]) {
       BookmarkButton* button = mock_button_.get();
       [[[pasteboard stub]
         andReturn:[NSData dataWithBytes:&button length:sizeof(button)]]
@@ -143,7 +145,8 @@ class BookmarkBarFolderViewTest : public CocoaProfileTest {
 };
 
 TEST_F(BookmarkBarFolderViewTest, BookmarkButtonDragAndDrop) {
-  id drag_info = GetFakeDragInfoForType(kBookmarkButtonDragType);
+  id drag_info = GetFakeDragInfoForType(
+      ui::ClipboardUtil::UTIForPasteboardType(kBookmarkButtonDragType));
   [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
    draggingEntered:drag_info];
   [[[mock_controller_ expect] andReturnBool:NO] dragBookmarkData:drag_info];
@@ -168,7 +171,8 @@ TEST_F(BookmarkBarFolderViewTest, BookmarkButtonDragAndDropAcrossProfiles) {
       YES, BookmarkModelFactory::GetForProfile(other_profile)));
   [view_ setController:mock_controller_];
 
-  id drag_info = GetFakeDragInfoForType(kBookmarkButtonDragType);
+  id drag_info = GetFakeDragInfoForType(
+      ui::ClipboardUtil::UTIForPasteboardType(kBookmarkButtonDragType));
   [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
    draggingEntered:drag_info];
   [[[mock_controller_ expect] andReturnBool:NO] dragBookmarkData:drag_info];
@@ -197,7 +201,8 @@ TEST_F(BookmarkBarFolderViewTest, URLDragAndDrop) {
 }
 
 TEST_F(BookmarkBarFolderViewTest, BookmarkButtonDropIndicator) {
-  id drag_info = GetFakeDragInfoForType(kBookmarkButtonDragType);
+  id drag_info = GetFakeDragInfoForType(
+      ui::ClipboardUtil::UTIForPasteboardType(kBookmarkButtonDragType));
   [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
    draggingEntered:drag_info];
   EXPECT_EQ([view_ draggingEntered:drag_info], NSDragOperationMove);