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

BUG=chromium:350245

Review URL: https://codereview.chromium.org/581583003

Cr-Commit-Position: refs/heads/master@{#295517}

chrome/browser/extensions/component_loader.cc

@@ -503,13 +503,11 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
 
 #if defined(OS_CHROMEOS) && defined(GOOGLE_CHROME_BUILD)
   // Since this is a v2 app it has a background page.
-  if (!command_line->HasSwitch(chromeos::switches::kDisableGeniusApp)) {
-    AddWithNameAndDescription(IDR_GENIUS_APP_MANIFEST,
-                              base::FilePath(FILE_PATH_LITERAL(
-                                  "/usr/share/chromeos-assets/genius_app")),
-                              IDS_GENIUS_APP_NAME,
-                              IDS_GENIUS_APP_DESCRIPTION);
-  }
+  AddWithNameAndDescription(IDR_GENIUS_APP_MANIFEST,
+                            base::FilePath(FILE_PATH_LITERAL(
+                                "/usr/share/chromeos-assets/genius_app")),
+                            IDS_GENIUS_APP_NAME,
+                            IDS_GENIUS_APP_DESCRIPTION);
 #endif
 
   if (!skip_session_components) {

chrome/browser/ui/chrome_pages.cc

@@ -36,7 +36,6 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/genius_app/app_id.h"
-#include "chromeos/chromeos_switches.h"
 #include "extensions/browser/extension_registry.h"
 #endif
 
@@ -76,16 +75,12 @@ void ShowHelpImpl(Browser* browser,
                   HelpSource source) {
   content::RecordAction(UserMetricsAction("ShowHelpTab"));
 #if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD)
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (!command_line->HasSwitch(chromeos::switches::kDisableGeniusApp)) {
-    const extensions::Extension* extension =
-        extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
-            genius_app::kGeniusAppId,
-            extensions::ExtensionRegistry::EVERYTHING);
-    OpenApplication(AppLaunchParams(profile, extension, 0, host_desktop_type));
-    return;
-  }
-#endif
+  const extensions::Extension* extension =
+      extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
+          genius_app::kGeniusAppId,
+          extensions::ExtensionRegistry::EVERYTHING);
+  OpenApplication(AppLaunchParams(profile, extension, 0, host_desktop_type));
+#else
   GURL url;
   switch (source) {
     case HELP_SOURCE_KEYBOARD:
@@ -107,6 +102,7 @@ void ShowHelpImpl(Browser* browser,
     browser = displayer->browser();
   }
   ShowSingletonTab(browser, url);
+#endif
 }
 
 }  // namespace

chrome/browser/ui/toolbar/wrench_menu_model.cc

@@ -199,12 +199,10 @@ class WrenchMenuModel::HelpMenuModel : public ui::SimpleMenuModel {
 
  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;
-    }
+    int help_string_id = IDS_GET_HELP;
+#else
+    int help_string_id = IDS_HELP_PAGE;
 #endif
     AddItemWithStringId(IDC_HELP_PAGE_VIA_MENU, help_string_id);
     if (browser_defaults::kShowHelpMenuItemIcon) {

chromeos/chromeos_switches.cc

@@ -37,9 +37,6 @@ const char kDisableBootAnimation[] = "disable-boot-animation";
 // Disables the ChromeOS demo.
 const char kDisableDemoMode[] = "disable-demo-mode";
 
-// Disable Genius App and use the original Help App instead.
-const char kDisableGeniusApp[] = "disable-genius-app";
-
 // Disable HID-detection OOBE screen.
 const char kDisableHIDDetectionOnOOBE[] = "disable-hid-detection-on-oobe";
 

chromeos/chromeos_switches.h

@@ -30,7 +30,6 @@ CHROMEOS_EXPORT extern const char kDerelictIdleTimeout[];
 CHROMEOS_EXPORT extern const char kDisableBootAnimation[];
 CHROMEOS_EXPORT extern const char kDisableDemoMode[];
 CHROMEOS_EXPORT extern const char kDisableGaiaServices[];
-CHROMEOS_EXPORT extern const char kDisableGeniusApp[];
 CHROMEOS_EXPORT extern const char kDisableHIDDetectionOnOOBE[];
 CHROMEOS_EXPORT extern const char kDisableLoginAnimations[];
 CHROMEOS_EXPORT extern const char kDisableLoginScrollIntoView[];