Revert "Enabled the App Info dialog on the Extensions page by default"

chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index 6393d6e2ca5f57a0ad7cb414de9e79ee6ffc5f43..32cc59d81039ebc08ce3111841db6684b5cf1b09 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -108,23 +108,10 @@ using content::RenderViewHost;
 using content::WebContents;
 
 namespace {
-
 const char kAppsDeveloperToolsExtensionId[] =
     "ohmmkhmmmpcnpikjeljgnaoabkaalbgc";
-
-// Returns true if the extensions page should display the new-style extension
-// info dialog. If false, display the old permissions dialog.
-bool ShouldDisplayExtensionInfoDialog() {
-#if defined(OS_MACOSX)
-  return false;
-#else
-  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
-      extensions::switches::kDisableExtensionInfoDialog);
-#endif
 }
 
-}  // namespace
-
 namespace extensions {
 
 ExtensionPage::ExtensionPage(const GURL& url,
@@ -553,7 +540,8 @@ void ExtensionSettingsHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_RELOAD_UNPACKED));
   source->AddString("extensionSettingsOptions",
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS_LINK));
-  if (ShouldDisplayExtensionInfoDialog()) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableExtensionInfoDialog)) {
     source->AddString("extensionSettingsPermissions",
                       l10n_util::GetStringUTF16(IDS_EXTENSIONS_INFO_LINK));
   } else {
@@ -1214,7 +1202,8 @@ void ExtensionSettingsHandler::HandlePermissionsMessage(
 
   // Show the new-style extensions dialog when the flag is set. The flag cannot
   // be set on Mac platforms.
-  if (ShouldDisplayExtensionInfoDialog()) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableExtensionInfoDialog)) {
     UMA_HISTOGRAM_ENUMERATION("Apps.AppInfoDialog.Launches",
                               AppInfoLaunchSource::FROM_EXTENSIONS_PAGE,
                               AppInfoLaunchSource::NUM_LAUNCH_SOURCES);