Setting the touch wrench menu as default menu for ChromeOS

chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc

 // Copyright (c) 2012 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/browser_tabstrip.h"
 #include "chrome/browser/ui/global_error/global_error.h"
@@ skipping 114 matching lines @@
   TestWrenchMenuModel model(this, browser());
   int itemCount = model.GetItemCount();
 
   // Verify it has items. The number varies by platform, so we don't check
   // the exact number.
   EXPECT_GT(itemCount, 10);
 
   // Execute a couple of the items and make sure it gets back to our delegate.
   // We can't use CountEnabledExecutable() here because the encoding menu's
   // delegate is internal, it doesn't use the one we pass in.
-  model.ActivatedAt(0);
-  EXPECT_TRUE(model.IsEnabledAt(0));
+  // Note: The new menu has a spacing separator at the first slot.
+  model.ActivatedAt(1);
+  EXPECT_TRUE(model.IsEnabledAt(1));
   // Make sure to use the index that is not separator in all configurations.
   model.ActivatedAt(2);
   EXPECT_TRUE(model.IsEnabledAt(2));
   EXPECT_EQ(model.execute_count_, 2);
   EXPECT_EQ(model.enable_count_, 2);
 
   model.execute_count_ = 0;
   model.enable_count_ = 0;
 
   // Choose something from the bookmark submenu and make sure it makes it back
@@ skipping 49 matching lines @@
 
 class EncodingMenuModelTest : public BrowserWithTestWindowTest,
                               public MenuModelTest {
 };
 
 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) {
   EncodingMenuModel model(browser());
   ASSERT_EQ(NULL, chrome::GetActiveWebContents(browser()));
   EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591));
 }