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

chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm

Index: chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm
===================================================================
--- chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm	(revision 32459)
+++ chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm	(working copy)
@@ -59,11 +59,11 @@
   virtual void SetUp() {
     CocoaTest::SetUp();
     controller_ = CreateController();
-    EXPECT_TRUE([controller_ window]);
+    [controller_ runAsModalSheet];
   }
 
   virtual void TearDown() {
-    [controller_ close];
+    controller_ = NULL;
     CocoaTest::TearDown();
   }
 };
@@ -71,6 +71,7 @@
 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());