Remove --ppapi-flash-in-process flag.

a) I'm pretty sure it mostly doesn't work anymore (it's been at least
sort of broken for a long time). b) I'm pretty sure no one uses it.

BUG=344054
R=yzshen@chromium.org
TBR=thestig@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251635 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 1 insertions, 12 deletions

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index b0e2bb0..c762601 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1583,7 +1583,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
       switches::kOutOfProcessPdf,
       switches::kPlaybackMode,
       switches::kPpapiFlashArgs,
-      switches::kPpapiFlashInProcess,
       switches::kPpapiFlashPath,
       switches::kPpapiFlashVersion,
       switches::kProfilingAtStart,
@@ -1622,7 +1621,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
     static const char* const kSwitchNames[] = {
       // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox.
       switches::kDisableBundledPpapiFlash,
-      switches::kPpapiFlashInProcess,
       switches::kPpapiFlashPath,
       switches::kPpapiFlashVersion,
     };
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
index 486125e..719d1bb 100644
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -119,7 +119,6 @@ std::string DeriveCommandLine(const GURL& start_url,
       ::switches::kNoSandbox,
       ::switches::kNumRasterThreads,
       ::switches::kPpapiFlashArgs,
-      ::switches::kPpapiFlashInProcess,
       ::switches::kPpapiFlashPath,
       ::switches::kPpapiFlashVersion,
       ::switches::kPpapiInProcess,
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index e1f032a..44fc688 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -334,10 +334,7 @@ content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path,
                                                 const std::string& version) {
   content::PepperPluginInfo plugin;
 
-  // Flash being out of process is handled separately than general plugins
-  // for testing purposes.
-  plugin.is_out_of_process = !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kPpapiFlashInProcess);
+  plugin.is_out_of_process = true;
   plugin.name = content::kFlashPluginName;
   plugin.path = path;
   plugin.permissions = kPepperFlashPermissions;
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index fffc3d7..d1bd254 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1154,10 +1154,6 @@ const char kPlaybackMode[]                  = "playback-mode";
 // Overrides the path to the location that PNaCl is installed.
 const char kPnaclDir[]                      = "pnacl-dir";
 
-// Forces the PPAPI version of Flash (if it's being used) to run in the
-// renderer process rather than in a separate plugin process.
-const char kPpapiFlashInProcess[]           = "ppapi-flash-in-process";
-
 // Use the PPAPI (Pepper) Flash found at the given path.
 const char kPpapiFlashPath[]                = "ppapi-flash-path";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 8b22543..05ff656 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -313,7 +313,6 @@ extern const char kParentProfile[];
 extern const char kPerformanceMonitorGathering[];
 extern const char kPlaybackMode[];
 extern const char kPnaclDir[];
-extern const char kPpapiFlashInProcess[];
 extern const char kPpapiFlashPath[];
 extern const char kPpapiFlashVersion[];
 extern const char kPrefetchSearchResults[];