Share the code that builds the page menu in a common model, make Mac and Win ...

chrome/browser/cocoa/toolbar_controller_unittest.mm

Index: chrome/browser/cocoa/toolbar_controller_unittest.mm
===================================================================
--- chrome/browser/cocoa/toolbar_controller_unittest.mm	(revision 33814)
+++ chrome/browser/cocoa/toolbar_controller_unittest.mm	(working copy)
@@ -44,7 +44,7 @@
   // |-toolbarViews| method.
   enum {
     kBackIndex, kForwardIndex, kReloadIndex, kHomeIndex, kStarIndex, kGoIndex,
-    kPageIndex, kWrenchIndex, kLocationIndex, kEncodingMenuIndex,
+    kPageIndex, kWrenchIndex, kLocationIndex,
     kBrowserActionContainerViewIndex
   };
 
@@ -283,13 +283,4 @@
   EXPECT_TRUE([bar_ hoverButtonForEvent:nil]);
 }
 
-TEST_F(ToolbarControllerTest, PopulateEncodingMenu) {
-  NSMenu* encodings = [[bar_ toolbarViews] objectAtIndex:kEncodingMenuIndex];
-
-  // Can't check item strings because of localization, but the nib has zero
-  // items so check that we at least populated the menu with something at
-  // startup.
-  EXPECT_NE(0, [encodings numberOfItems]);
-}
-
 }  // namespace