Removed un-used commandline switches.

--disable-gl-multisampling (replaced by gpu_driver_bug_workaround
                            switch --disable_multisampling)
--enable-chromium-branding (no longer used)
--force_discrete (no longer used, use gpu_driver_bug_workaround instead)
--force_integrated (no longer used, use gpu_driver_bug_workaround instead)
--gpu-switching (no longer used, use gpu_driver_bug_workaround instead)

BUG=351312
TEST=bots
R=kbr@chromium.org,piman@chromium.org,sky@chromium.org,nfullagar@chromium.org

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

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

11 files changed, 5 insertions, 43 deletions

diff --git a/chrome/test/base/chrome_process_util.cc b/chrome/test/base/chrome_process_util.cc
index 0d08db0..2705fb1 100644
--- a/chrome/test/base/chrome_process_util.cc
+++ b/chrome/test/base/chrome_process_util.cc
@@ -21,23 +21,9 @@ using base::TimeTicks;
 
 namespace {
 
-// Returns the executable name of the current Chrome browser process.
-const base::FilePath::CharType* GetRunningBrowserExecutableName() {
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kEnableChromiumBranding))
-    return chrome::kBrowserProcessExecutableNameChromium;
-  return chrome::kBrowserProcessExecutableName;
-}
-
 // Returns the executable name of the current Chrome helper process.
 std::vector<base::FilePath::StringType> GetRunningHelperExecutableNames() {
-  base::FilePath::StringType name;
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kEnableChromiumBranding)) {
-    name = chrome::kHelperProcessExecutableNameChromium;
-  } else {
-    name = chrome::kHelperProcessExecutableName;
-  }
+  base::FilePath::StringType name = chrome::kHelperProcessExecutableName;
 
   std::vector<base::FilePath::StringType> names;
   names.push_back(name);
@@ -95,7 +81,7 @@ class ChildProcessFilter : public base::ProcessFilter {
 
 ChromeProcessList GetRunningChromeProcesses(base::ProcessId browser_pid) {
   const base::FilePath::CharType* executable_name =
-      GetRunningBrowserExecutableName();
+      chrome::kBrowserProcessExecutableName;
   ChromeProcessList result;
   if (browser_pid == static_cast<base::ProcessId>(-1))
     return result;
diff --git a/chrome/test/base/test_switches.cc b/chrome/test/base/test_switches.cc
index 86d4988..b1b16ac 100644
--- a/chrome/test/base/test_switches.cc
+++ b/chrome/test/base/test_switches.cc
@@ -9,9 +9,6 @@ namespace switches {
 // Also emit full event trace logs for successful tests.
 const char kAlsoEmitSuccessLogs[] = "also-emit-success-logs";
 
-// Enable Chromium branding of the executable.
-const char kEnableChromiumBranding[] = "enable-chromium-branding";
-
 // Enable displaying error dialogs (for debugging).
 const char kEnableErrorDialogs[] = "enable-errdialogs";
 
diff --git a/chrome/test/base/test_switches.h b/chrome/test/base/test_switches.h
index 9b4cd2b..5c80140 100644
--- a/chrome/test/base/test_switches.h
+++ b/chrome/test/base/test_switches.h
@@ -12,7 +12,6 @@ namespace switches {
 // All switches in alphabetical order. The switches should be documented
 // alongside the definition of their values in the .cc file.
 extern const char kAlsoEmitSuccessLogs[];
-extern const char kEnableChromiumBranding[];
 extern const char kEnableErrorDialogs[];
 
 #if defined(OS_WIN)
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index 2bea73f..ec27223 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -273,7 +273,7 @@ class WebGLMultisamplingTest : public GpuFeatureTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     GpuFeatureTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kDisableGLMultisampling);
+    command_line->AppendSwitch("disable_multisampling");
   }
 };
 
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 582496e..956786b 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -387,8 +387,6 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) {
       GpuProcessHost::gpu_enabled() &&
       !command_line.HasSwitch(switches::kDisableFlashStage3d);
 
-  prefs.gl_multisampling_enabled =
-      !command_line.HasSwitch(switches::kDisableGLMultisampling);
   prefs.site_specific_quirks_enabled =
       !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks);
   prefs.allow_file_access_from_file_urls =
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 3af9208..247f10e 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -154,9 +154,6 @@ const char kDisableFlashStage3d[]           = "disable-flash-stage3d";
 
 const char kDisableGestureTapHighlight[]    = "disable-gesture-tap-highlight";
 
-// Disable GL multisampling.
-const char kDisableGLMultisampling[]        = "disable-gl-multisampling";
-
 // Disables GPU hardware acceleration.  If software renderer is not in place,
 // then the GPU process won't launch.
 const char kDisableGpu[]                    = "disable-gpu";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 7a8b673..fabd6bf 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -54,7 +54,6 @@ CONTENT_EXPORT extern const char kDisableFileSystem[];
 CONTENT_EXPORT extern const char kDisableFlash3d[];
 CONTENT_EXPORT extern const char kDisableFlashStage3d[];
 CONTENT_EXPORT extern const char kDisableGestureTapHighlight[];
-CONTENT_EXPORT extern const char kDisableGLMultisampling[];
 CONTENT_EXPORT extern const char kDisableGpu[];
 CONTENT_EXPORT extern const char kDisableGpuCompositing[];
 extern const char kDisableGpuProcessCrashLimit[];
diff --git a/native_client_sdk/doc_generated/devguide/coding/3D-graphics.html b/native_client_sdk/doc_generated/devguide/coding/3D-graphics.html
index f633cb4..bfd391a 100644
--- a/native_client_sdk/doc_generated/devguide/coding/3D-graphics.html
+++ b/native_client_sdk/doc_generated/devguide/coding/3D-graphics.html
@@ -147,7 +147,7 @@ flags (all at once) and watching how your application responds:</p>
 <ul class="small-gap">
 <li><code>--disable-webgl</code></li>
 <li><code>--disable-pepper-3d</code></li>
-<li><code>--disable-gl-multisampling</code></li>
+<li><code>--disable_multisampling</code></li>
 <li><code>--disable-accelerated-compositing</code></li>
 <li><code>--disable-accelerated-2d-canvas</code></li>
 </ul>
diff --git a/native_client_sdk/src/doc/devguide/coding/3D-graphics.rst b/native_client_sdk/src/doc/devguide/coding/3D-graphics.rst
index 4bf07ae..44c08c0 100644
--- a/native_client_sdk/src/doc/devguide/coding/3D-graphics.rst
+++ b/native_client_sdk/src/doc/devguide/coding/3D-graphics.rst
@@ -186,7 +186,7 @@ flags (all at once) and watching how your application responds:
 
 * ``--disable-webgl``
 * ``--disable-pepper-3d``
-* ``--disable-gl-multisampling``
+* ``--disable_multisampling``
 * ``--disable-accelerated-compositing``
 * ``--disable-accelerated-2d-canvas``
 
diff --git a/ui/gl/gl_switches.cc b/ui/gl/gl_switches.cc
index a32c5f6..7eaa3d8 100644
--- a/ui/gl/gl_switches.cc
+++ b/ui/gl/gl_switches.cc
@@ -49,13 +49,6 @@ const char kGpuNoContextLost[]              = "gpu-no-context-lost";
 // Indicates whether the dual GPU switching is supported or not.
 const char kSupportsDualGpus[]              = "supports-dual-gpus";
 
-// Overwrite the default GPU automatic switching behavior to force on
-// integrated GPU or discrete GPU.
-const char kGpuSwitching[]                  = "gpu-switching";
-
-const char kGpuSwitchingOptionNameForceIntegrated[] = "force_integrated";
-const char kGpuSwitchingOptionNameForceDiscrete[]   = "force_discrete";
-
 // Flag used for Linux tests: for desktop GL bindings, try to load this GL
 // library first, but fall back to regular library if loading fails.
 const char kTestGLLib[]                     = "test-gl-lib";
diff --git a/ui/gl/gl_switches.h b/ui/gl/gl_switches.h
index 779ecfb..2824cec 100644
--- a/ui/gl/gl_switches.h
+++ b/ui/gl/gl_switches.h
@@ -31,13 +31,6 @@ GL_EXPORT extern const char kEnableGPUServiceTracing[];
 GL_EXPORT extern const char kGpuNoContextLost[];
 
 GL_EXPORT extern const char kSupportsDualGpus[];
-GL_EXPORT extern const char kGpuSwitching[];
-
-// The GPU switching names that can be passed to --gpu-switching.
-GL_EXPORT extern const char kGpuSwitchingOptionNameForceIntegrated[];
-GL_EXPORT extern const char kGpuSwitchingOptionNameForceDiscrete[];
-// The last one (automatic) is not used as commandline switch option.
-GL_EXPORT extern const char kGpuSwitchingOptionNameAutomatic[];
 
 GL_EXPORT extern const char kUseGL[];
 GL_EXPORT extern const char kSwiftShaderPath[];