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

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_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"
+#include "base/string16.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.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 "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
@@ skipping 32 matching lines @@
 const CGFloat kFakeIndicatorPos = 7.0;
 const NSPoint kPoint = {10, 10};
 
 class BookmarkBarFolderViewTest : public CocoaProfileTest {
  public:
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
 
     view_.reset([[BookmarkBarFolderView alloc] init]);
 
-    // The created window will be destroyed in |CocoaProfileTest::TearDown()|.
-    window_ = CreateBrowserWindow()->GetNativeHandle();
     mock_controller_.reset(GetMockController(YES,
                                              profile()->GetBookmarkModel()));
 
     mock_button_.reset(GetMockButton(mock_controller_.get()));
     [view_ awakeFromNib];
     [view_ setController:mock_controller_];
   }
 
   virtual void TearDown() {
     [mock_controller_ verify];
-
-    // Order is important here: We need to release the mock objects *prior* to
-    // calling |CocoaProfileTest::TearDown()|. This is because the
-    // |mock_controller_| retains |window_|; and if any windows remain allocated
-    // when |CocoaProfileTest::TearDown()| is called, this triggers an assertion
-    // in |ui_cocoa_test_helper.mm|.
-    mock_controller_.reset();
-    mock_button_.reset();
     CocoaProfileTest::TearDown();
   }
 
   id GetFakePasteboardForType(NSString* dataType) {
     id pasteboard = [OCMockObject mockForClass:[NSPasteboard class]];
     if ([dataType isEqualToString:kBookmarkButtonDragType]) {
       BookmarkButton* button = mock_button_.get();
       [[[pasteboard stub]
         andReturn:[NSData dataWithBytes:&button length:sizeof(button)]]
        dataForType:dataType];
@@ skipping 24 matching lines @@
 
   id GetMockController(BOOL show_indicator, BookmarkModel* model) {
     id mock_controller =
         [OCMockObject mockForClass:[BookmarkBarFolderController class]];
     [[[mock_controller stub] andReturnBool:YES]
      draggingAllowed:OCMOCK_ANY];
     [[[mock_controller stub] andReturnBool:show_indicator]
      shouldShowIndicatorShownForPoint:kPoint];
     [[[mock_controller stub] andReturnFloat:kFakeIndicatorPos]
      indicatorPosForDragToPoint:kPoint];
-    [[[mock_controller stub] andReturn:window_] browserWindow];
     [[[mock_controller stub] andReturnValue:OCMOCK_VALUE(model)] bookmarkModel];
     return [mock_controller retain];
   }
 
   id GetMockButton(id mock_controller) {
+    BookmarkModel* bookmark_model = profile()->GetBookmarkModel();
+    const BookmarkNode* node =
+        bookmark_model->AddURL(bookmark_model->bookmark_bar_node(),
+                               0,
+                               ASCIIToUTF16("Test Bookmark"),
+                               GURL("http://www.exmaple.com"));
+
     id mock_button = [OCMockObject mockForClass:[BookmarkButton class]];
-    [[[mock_button stub] andReturn:mock_controller] delegate];
+    [[[mock_button stub] andReturnValue:OCMOCK_VALUE(node)] bookmarkNode];
     return [mock_button retain];
   }
 
   scoped_nsobject<id> mock_controller_;
   scoped_nsobject<BookmarkBarFolderView> view_;
-  NSWindow* window_;  // WEAK, owned by CocoaProfileTest
   scoped_nsobject<id> mock_button_;
 };
 
 TEST_F(BookmarkBarFolderViewTest, BookmarkButtonDragAndDrop) {
   id drag_info = GetFakeDragInfoForType(kBookmarkButtonDragType);
   [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
    draggingEntered:drag_info];
   [[[mock_controller_ expect] andReturnBool:NO] dragBookmarkData:drag_info];
   [[[mock_controller_ expect] andReturnBool:YES] dragButton:OCMOCK_ANY
                                                          to:kPoint
@@ skipping 53 matching lines @@
   EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos);
   mock_controller_.reset(GetMockController(NO, profile()->GetBookmarkModel()));
   [view_ setController:mock_controller_];
   [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
    draggingEntered:drag_info];
   EXPECT_EQ([view_ draggingEntered:drag_info], NSDragOperationMove);
   EXPECT_FALSE([view_ dropIndicatorShown]);
 }
 
 }  // namespace