[Mac] Fix "No drag (+) cursor displayed when dragging link over BMB"

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_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/memory/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 
 namespace {
   const CGFloat kFakeIndicatorPos = 7.0;
 };
 
 // Fake DraggingInfo, fake BookmarkBarController, fake NSPasteboard...
 @interface FakeBookmarkDraggingInfo : NSObject {
  @public
   BOOL dragButtonToPong_;
   BOOL dragURLsPong_;
   BOOL dragBookmarkDataPong_;
   BOOL dropIndicatorShown_;
   BOOL draggingEnteredCalled_;
   // Only mock one type of drag data at a time.
   NSString* dragDataType_;
+  id draggingSource_;
 }
 @property (nonatomic) BOOL dropIndicatorShown;
 @property (nonatomic) BOOL draggingEnteredCalled;
 @property (nonatomic, copy) NSString* dragDataType;
 @end
 
 @implementation FakeBookmarkDraggingInfo
 
 @synthesize dropIndicatorShown = dropIndicatorShown_;
 @synthesize draggingEnteredCalled = draggingEnteredCalled_;
@@ skipping 12 matching lines @@
 }
 
 - (void)reset {
   [dragDataType_ release];
   dragDataType_ = nil;
   dragButtonToPong_ = NO;
   dragURLsPong_ = NO;
   dragBookmarkDataPong_ = NO;
   dropIndicatorShown_ = YES;
   draggingEnteredCalled_ = NO;
+  draggingSource_ = self;
+}
+
+- (void)setDraggingSource:(id)draggingSource {
+  draggingSource_ = draggingSource;
 }
 
 // NSDragInfo mocking functions.
 
 - (id)draggingPasteboard {
   return self;
 }
 
 // So we can look local.
 - (id)draggingSource {
-  return self;
+  return draggingSource_;
 }
 
 - (NSDragOperation)draggingSourceOperationMask {
   return NSDragOperationCopy | NSDragOperationMove;
 }
 
 - (NSPoint)draggingLocation {
   return NSMakePoint(10, 10);
 }
 
@@ skipping 92 matching lines @@
 TEST_F(BookmarkBarViewTest, CanDragWindow) {
   EXPECT_FALSE([view_ mouseDownCanMoveWindow]);
 }
 
 TEST_F(BookmarkBarViewTest, BookmarkButtonDragAndDrop) {
   scoped_nsobject<FakeBookmarkDraggingInfo>
       info([[FakeBookmarkDraggingInfo alloc] init]);
   [view_ setController:info.get()];
   [info reset];
 
+  scoped_nsobject<BookmarkButton> dragged_button([[BookmarkButton alloc] init]);
+  [info setDraggingSource:dragged_button.get()];
   [info setDragDataType:kBookmarkButtonDragType];
   EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);
   EXPECT_TRUE([view_ performDragOperation:(id)info.get()]);
   EXPECT_TRUE([info dragButtonToPong]);
   EXPECT_FALSE([info dragURLsPong]);
   EXPECT_TRUE([info dragBookmarkDataPong]);
 }
 
 TEST_F(BookmarkBarViewTest, URLDragAndDrop) {
   scoped_nsobject<FakeBookmarkDraggingInfo>
       info([[FakeBookmarkDraggingInfo alloc] init]);
   [view_ setController:info.get()];
   [info reset];
 
   NSArray* dragTypes = [URLDropTargetHandler handledDragTypes];
   for (NSString* type in dragTypes) {
     [info setDragDataType:type];
-    EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);
+    EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationCopy);
     EXPECT_TRUE([view_ performDragOperation:(id)info.get()]);
     EXPECT_FALSE([info dragButtonToPong]);
     EXPECT_TRUE([info dragURLsPong]);
     EXPECT_TRUE([info dragBookmarkDataPong]);
     [info reset];
   }
 }
 
 TEST_F(BookmarkBarViewTest, BookmarkButtonDropIndicator) {
   scoped_nsobject<FakeBookmarkDraggingInfo>
       info([[FakeBookmarkDraggingInfo alloc] init]);
   [view_ setController:info.get()];
+  [info reset];
 
-  [info reset];
+  scoped_nsobject<BookmarkButton> dragged_button([[BookmarkButton alloc] init]);
+  [info setDraggingSource:dragged_button.get()];
   [info setDragDataType: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