Revert 48163 - Revert 47194 - On 375: Redisable internal Flash by default.

[i.e., redisable internal Flash by default once again]

Require --enable-internal-flash to enable it again.

TBR=laforge,cpu
Review URL: http://codereview.chromium.org/2061006

TBR=viettrungluu@chromium.org, laforge@chromium.org, cpu@chromium.org
Review URL: http://codereview.chromium.org/2155005

TBR=viettrungluu@chromium.org, laforge@chromium.org, cpu@chromium.org
Review URL: http://codereview.chromium.org/2427002

git-svn-id: svn://svn.chromium.org/chrome/branches/375/src@48679 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 6 deletions

diff --git a/chrome/common/chrome_plugin_lib.cc b/chrome/common/chrome_plugin_lib.cc
index e9d0224..ceb4e54 100644
--- a/chrome/common/chrome_plugin_lib.cc
+++ b/chrome/common/chrome_plugin_lib.cc
@@ -117,8 +117,9 @@ void ChromePluginLib::RegisterPluginsWithNPAPI() {
     NPAPI::PluginList::Singleton()->AddExtraPluginPath(path);
 
   // Register the internal Flash, if available.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableInternalFlash) &&
+  // TODO(viettrungluu): The command-line switch is temporary.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableInternalFlash) &&
       PathService::Get(chrome::FILE_FLASH_PLUGIN, &path))
     NPAPI::PluginList::Singleton()->AddExtraPluginPath(path);
 }
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index ad4d661..1c74138 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -125,9 +125,6 @@ const char kDisableGeolocation[]            = "disable-geolocation";
 // Suppresses hang monitor dialogs in renderer processes.
 const char kDisableHangMonitor[]            = "disable-hang-monitor";
 
-// Disable the internal Flash Player.
-const char kDisableInternalFlash[]          = "disable-internal-flash";
-
 // Don't resolve hostnames to IPv6 addresses. This can be used when debugging
 // issues relating to IPv6, but shouldn't otherwise be needed. Be sure to
 // file bugs if something isn't working properly in the presence of IPv6.
@@ -270,6 +267,9 @@ const char kEnableFileCookies[]             = "enable-file-cookies";
 // Enable the Indexed Database API.
 const char kEnableIndexedDatabase[]         = "enable-indexed-database";
 
+// Enable the internal Flash Player (if available).
+const char kEnableInternalFlash[]           = "enable-internal-flash";
+
 // Enable IPv6 support, even if probes suggest that it may not be fully
 // supported.  Some probes may require internet connections, and this flag will
 // allow support independent of application testing.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 6f45b57..7a26a75 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -50,7 +50,6 @@ extern const char kDisableDevTools[];
 extern const char kDisableExtensions[];
 extern const char kDisableGeolocation[];
 extern const char kDisableHangMonitor[];
-extern const char kDisableInternalFlash[];
 extern const char kDisableIPv6[];
 extern const char kDisableJavaScript[];
 extern const char kDisableJava[];
@@ -94,6 +93,7 @@ extern const char kEnableFileCookies[];
 extern const char kEnableGPUPlugin[];
 extern const char kEnableGPURendering[];
 extern const char kEnableIndexedDatabase[];
+extern const char kEnableInternalFlash[];
 extern const char kEnableIPv6[];
 extern const char kEnableLogging[];
 extern const char kEnableMonitorProfile[];