Fix yet another crash with bookmarks drag&drop on Mac.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.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/bookmarks/bookmark_bar_folder_view.h"
 
 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
@@ skipping 169 matching lines @@
 - (BOOL)performDragOperationForBookmarkButton:(id<NSDraggingInfo>)info {
   BOOL doDrag = NO;
   NSData* data = [[info draggingPasteboard]
                    dataForType:kBookmarkButtonDragType];
   // [info draggingSource] is nil if not the same application.
   if (data && [info draggingSource]) {
     BookmarkButton* button = nil;
     [data getBytes:&button length:sizeof(button)];
 
     // If we're dragging from one profile to another, disallow moving (only
-    // allow copying). Note that we need to call |GetOriginalProfile()| to make
-    // sure that Incognito profiles are handled correctly.
-    NSWindow* source_window = [[button delegate] browserWindow];
-    BrowserWindowController* source_window_controller =
-        [BrowserWindowController
-         browserWindowControllerForWindow:source_window];
-    const Profile* source_profile =
-        [source_window_controller profile]->GetOriginalProfile();
-    const Profile* target_profile =
-        [[self controller] bookmarkModel]->profile()->GetOriginalProfile();
+    // allow copying). Each profile has its own bookmark model, so one way to
+    // check whether we are dragging across profiles is to see if the
+    // |BookmarkNode| corresponding to |button| exists in this profile. If it
+    // does, we're dragging within a profile; otherwise, we're dragging across
+    // profiles.
+    const BookmarkModel* const model = [[self controller] bookmarkModel];
+    const BookmarkNode* const source_node = [button bookmarkNode];
+    const BookmarkNode* const target_node =
+        model->GetNodeByID(source_node->id());
 
     BOOL copy =
         !([info draggingSourceOperationMask] & NSDragOperationMove) ||
-        source_profile != target_profile;
+        (source_node != target_node);
     doDrag = [[self controller] dragButton:button
                                         to:[info draggingLocation]
                                       copy:copy];
     UserMetrics::RecordAction(UserMetricsAction("BookmarkBarFolder_DragEnd"));
   }
   return doDrag;
 }
 
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info {
   if ([[self controller] dragBookmarkData:info])
     return YES;
   NSPasteboard* pboard = [info draggingPasteboard];
   if ([pboard dataForType:kBookmarkButtonDragType] &&
       [self performDragOperationForBookmarkButton:info])
     return YES;
   if ([pboard containsURLData] && [self performDragOperationForURL:info])
     return YES;
   return NO;
 }
 
 @end