Merge 32441 - Change the folder presentation in the Bookmark Editor and the B...

chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm

 // Copyright (c) 2009 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 <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/bookmark_all_tabs_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
@@ skipping 41 matching lines @@
             initWithParentWindow:test_window()
                          profile:helper_.profile()
                           parent:group_a_
                    configuration:BookmarkEditor::SHOW_TREE
                          handler:nil];
   }
 
   virtual void SetUp() {
     CocoaTest::SetUp();
     controller_ = CreateController();
-    EXPECT_TRUE([controller_ window]);
+    [controller_ runAsModalSheet];
   }
 
   virtual void TearDown() {
-    [controller_ close];
+    controller_ = NULL;
     CocoaTest::TearDown();
   }
 };
 
 TEST_F(BookmarkAllTabsControllerTest, BookmarkAllTabs) {
   // OK button should always be enabled.
   EXPECT_TRUE([controller_ okButtonEnabled]);
+  [controller_ selectTestNodeInBrowser:group_a_];
   [controller_ setDisplayName:@"ALL MY TABS"];
   [controller_ ok:nil];
   EXPECT_EQ(4, group_a_->GetChildCount());
   const BookmarkNode* folderChild = group_a_->GetChild(3);
   EXPECT_EQ(folderChild->GetTitle(), L"ALL MY TABS");
   EXPECT_EQ(3, folderChild->GetChildCount());
 }