Re-land:

chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc

 // 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/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ skipping 1343 matching lines @@
     // Menu should be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // Button should be depressed.
     views::TextButton* button = bb_view_->GetBookmarkButton(0);
     ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED);
 
     // Close the window.
-    window_->CloseWindow();
+    window_->Close();
     window_ = NULL;
   }
 };
 
 // Disabled, http://crbug.com/64303.
 VIEW_TEST(BookmarkBarViewTest16, DISABLED_DeleteMenu)
 
 // Makes sure right clicking on an item while a context menu is already showing
 // doesn't crash and works.
 class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase {
@@ skipping 60 matching lines @@
 
     bb_view_->GetMenu()->GetMenuController()->CancelAll();
 
     Done();
   }
 
   ContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest17, ContextMenus3)