Make all views platforms use 'new' (cros-style) wrench menu.

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/prefs/browser_prefs.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 71 matching lines @@
   scoped_ptr<chrome::TestingIOThreadState> testing_io_thread_state_;
 };
 
 // Copies parts of MenuModelTest::Delegate and combines them with the
 // WrenchMenuModel since WrenchMenuModel is now a SimpleMenuModel::Delegate and
 // not derived from SimpleMenuModel.
 class TestWrenchMenuModel : public WrenchMenuModel {
  public:
   TestWrenchMenuModel(ui::AcceleratorProvider* provider,
                       Browser* browser)
-      : WrenchMenuModel(provider, browser, false),
+      : WrenchMenuModel(provider, browser),
         execute_count_(0),
         checked_count_(0),
         enable_count_(0) {
   }
 
   // Testing overrides to ui::SimpleMenuModel::Delegate:
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
     bool val = WrenchMenuModel::IsCommandIdChecked(command_id);
     if (val)
       checked_count_++;
@@ skipping 66 matching lines @@
   ProfileOAuth2TokenServiceFactory::GetForProfile(browser()->profile());
   const int command1 = 1234567;
   // AddGlobalError takes ownership of error1.
   MenuError* error1 = new MenuError(command1);
   service->AddGlobalError(error1);
   const int command2 = 1234568;
   // AddGlobalError takes ownership of error2.
   MenuError* error2 = new MenuError(command2);
   service->AddGlobalError(error2);
 
-  WrenchMenuModel model(this, browser(), false);
+  WrenchMenuModel model(this, browser());
   int index1 = model.GetIndexOfCommandId(command1);
   EXPECT_GT(index1, -1);
   int index2 = model.GetIndexOfCommandId(command2);
   EXPECT_GT(index2, -1);
 
   EXPECT_TRUE(model.IsEnabledAt(index1));
   EXPECT_EQ(0, error1->execute_count());
   model.ActivatedAt(index1);
   EXPECT_EQ(1, error1->execute_count());
 
   EXPECT_TRUE(model.IsEnabledAt(index2));
   EXPECT_EQ(0, error2->execute_count());
   model.ActivatedAt(index2);
   EXPECT_EQ(1, error1->execute_count());
 }
 
 class EncodingMenuModelTest : public BrowserWithTestWindowTest,
                               public MenuModelTest {
 };
 
 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) {
   EncodingMenuModel model(browser());
   ASSERT_EQ(NULL, browser()->tab_strip_model()->GetActiveWebContents());
   EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591));
 }