mac: More pasteboard fixes.

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

 // Copyright (c) 2012 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_nsobject.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
+#include "ui/base/clipboard/clipboard_util_mac.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 namespace {
 
 // Some values used for mocks and fakes.
 const CGFloat kFakeIndicatorPos = 7.0;
 const NSPoint kPoint = {10, 10};
 
@@ skipping 196 matching lines @@
 
   base::scoped_nsobject<BookmarkButtonCell> button_cell(
       [[BookmarkButtonCell buttonCellForNode:node
                                         text:nil
                                        image:nil
                               menuController:nil] retain]);
   base::scoped_nsobject<BookmarkButton> dragged_button(
       [[BookmarkButton alloc] init]);
   [dragged_button setCell:button_cell];
   [info setDraggingSource:dragged_button.get()];
-  [info setDragDataType:kBookmarkButtonDragType];
+  [info setDragDataType:ui::ClipboardUtil::UTIForPasteboardType(
+                            kBookmarkButtonDragType)];
   [info setButton:dragged_button.get()];
   [info setBookmarkModel:bookmark_model];
   EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);
   EXPECT_TRUE([view_ performDragOperation:(id)info.get()]);
   EXPECT_TRUE([info dragButtonToPong]);
   EXPECT_FALSE([info dragButtonToShouldCopy]);
   EXPECT_FALSE([info dragURLsPong]);
   EXPECT_TRUE([info dragBookmarkDataPong]);
 }
 
@@ skipping 21 matching lines @@
 
   base::scoped_nsobject<BookmarkButtonCell> button_cell(
       [[BookmarkButtonCell buttonCellForNode:node
                                         text:nil
                                        image:nil
                               menuController:nil] retain]);
   base::scoped_nsobject<BookmarkButton> dragged_button(
       [[BookmarkButton alloc] init]);
   [dragged_button setCell:button_cell];
   [info setDraggingSource:dragged_button.get()];
-  [info setDragDataType:kBookmarkButtonDragType];
+  [info setDragDataType:ui::ClipboardUtil::UTIForPasteboardType(
+                            kBookmarkButtonDragType)];
   [info setButton:dragged_button.get()];
   [info setBookmarkModel:BookmarkModelFactory::GetForProfile(other_profile)];
   EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);
   EXPECT_TRUE([view_ performDragOperation:(id)info.get()]);
   EXPECT_TRUE([info dragButtonToPong]);
   EXPECT_TRUE([info dragButtonToShouldCopy]);
   EXPECT_FALSE([info dragURLsPong]);
   EXPECT_TRUE([info dragBookmarkDataPong]);
 }
 
@@ skipping 17 matching lines @@
 
 TEST_F(BookmarkBarViewTest, BookmarkButtonDropIndicator) {
   base::scoped_nsobject<FakeBookmarkDraggingInfo> info(
       [[FakeBookmarkDraggingInfo alloc] init]);
   [view_ setController:info.get()];
   [info reset];
 
   base::scoped_nsobject<BookmarkButton> dragged_button(
       [[BookmarkButton alloc] init]);
   [info setDraggingSource:dragged_button.get()];
-  [info setDragDataType:kBookmarkButtonDragType];
+  [info setDragDataType:ui::ClipboardUtil::UTIForPasteboardType(
+                            kBookmarkButtonDragType)];
   EXPECT_FALSE([info draggingEnteredCalled]);
   EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);
   EXPECT_TRUE([info draggingEnteredCalled]);  // Ensure controller pinged.
   EXPECT_TRUE([view_ dropIndicatorShown]);
   EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos);
 
   [info setDropIndicatorShown:NO];
   EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);
   EXPECT_FALSE([view_ dropIndicatorShown]);
 }
 
 }  // namespace