Reland r105450: Linux: add basic bookmark menu support. More features can be added later.

chrome/browser/ui/toolbar/wrench_menu_model_unittest.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 "chrome/browser/ui/toolbar/wrench_menu_model.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/global_error.h"
 #include "chrome/browser/ui/global_error_service.h"
@@ skipping 131 matching lines @@
   int bookmarksModelIndex = -1;
   for (int i = 0; i < itemCount; ++i) {
     if (model.GetTypeAt(i) == ui::MenuModel::TYPE_SUBMENU) {
       bookmarksModelIndex = i;
       break;
     }
   }
   EXPECT_GT(bookmarksModelIndex, -1);
   ui::MenuModel* bookmarksModel = model.GetSubmenuModelAt(bookmarksModelIndex);
   EXPECT_TRUE(bookmarksModel);
+  // The bookmarks model may be empty until we tell it we're going to show it.
+  bookmarksModel->MenuWillShow();
   EXPECT_GT(bookmarksModel->GetItemCount(), 1);
   bookmarksModel->ActivatedAt(1);
   EXPECT_TRUE(bookmarksModel->IsEnabledAt(1));
   EXPECT_EQ(model.execute_count_, 1);
   EXPECT_EQ(model.enable_count_, 1);
 }
 
 // Tests global error menu items in the wrench menu.
 TEST_F(WrenchMenuModelTest, GlobalError) {
   GlobalErrorService* service =
@@ skipping 26 matching lines @@
 
 class EncodingMenuModelTest : public BrowserWithTestWindowTest,
                               public MenuModelTest {
 };
 
 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) {
   EncodingMenuModel model(browser());
   ASSERT_EQ(NULL, browser()->GetSelectedTabContents());
   EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591));
 }