Remove flag --disable-genius-app since it's been public launched for several milestones

chrome/browser/ui/toolbar/wrench_menu_model.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 <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 183 matching lines @@
       : SimpleMenuModel(delegate) {
     Build(browser);
   }
   virtual ~HelpMenuModel() {
   }
 
  private:
   void Build(Browser* browser) {
     int help_string_id = IDS_HELP_PAGE;
 #if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD)
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-            chromeos::switches::kDisableGeniusApp)) {
-      help_string_id = IDS_GET_HELP;
-    }
-#endif
+    help_string_id = IDS_GET_HELP;
+#else

[sky, 2014/09/18 13:03:24]

This isn't the same as the old code. I was saying do:
#if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD)
int help_string_id = IDS_GET_HELP;
#else
int help_tring_id = IDS_HELP_PAGE;
#endif

Or move thee ifdefs into a function that you call from here, so that this code
becomes:

AddItemWithStringId(..., GetHelpStringId());

[cylee1, 2014/09/18 13:25:59]

sorry, mistake...

     AddItemWithStringId(IDC_HELP_PAGE_VIA_MENU, help_string_id);
     if (browser_defaults::kShowHelpMenuItemIcon) {
       ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE_VIA_MENU),
               rb.GetNativeImageNamed(IDR_HELP_MENU));
     }
 
     AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
+#endif
   }
 
   DISALLOW_COPY_AND_ASSIGN(HelpMenuModel);
 };
 
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolsMenuModel
 
@@ skipping 558 matching lines @@
                        ->GetZoomPercent();
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 void WrenchMenuModel::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   UpdateZoomControls();
 }