5 files changed, 7 insertions, 24 deletions
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index eabb3c6..a596176 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -182,9 +182,6 @@ const char kDisableSiteSpecificQuirks[]     = "disable-site-specific-quirks";
 // Disables speech input.
 const char kDisableSpeechInput[]            = "disable-speech-input";
 
-// Disable Spellcheck API.
-const char kDisableSpellcheckAPI[]          = "disable-spellcheck-api";
-
 // Disable web audio API.
 const char kDisableWebAudio[]               = "disable-webaudio";
 
@@ -249,9 +246,6 @@ const char kEnablePointerLock[]             = "enable-pointer-lock";
 // Enable the Gamepad API
 const char kEnableGamepad[]                 = "enable-gamepad";
 
-// Enable the GPU plugin and Pepper 3D rendering.
-const char kEnableGPUPlugin[]               = "enable-gpu-plugin";
-
 // Force logging to be enabled.  Logging is disabled by default in release
 // builds.
 const char kEnableLogging[]                 = "enable-logging";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 46e3aa9..0ba69a3 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -67,7 +67,6 @@ extern const char kDisableSessionStorage[];
 extern const char kDisableSharedWorkers[];
 extern const char kDisableSiteSpecificQuirks[];
 CONTENT_EXPORT extern const char kDisableSpeechInput[];
-extern const char kDisableSpellcheckAPI[];
 CONTENT_EXPORT extern const char kDisableWebAudio[];
 extern const char kDisableWebSecurity[];
 extern const char kDisableWebSockets[];
@@ -86,7 +85,6 @@ extern const char kEnableFastback[];
 CONTENT_EXPORT extern const char kDisableFullScreen[];
 extern const char kEnablePointerLock[];
 extern const char kEnableGamepad[];
-extern const char kEnableGPUPlugin[];
 CONTENT_EXPORT extern const char kEnableLogging[];
 extern const char kEnableMediaSource[];
 extern const char kEnableMediaStream[];
@@ -128,10 +126,6 @@ extern const char kHighLatencyAudio[];
 // TODO(jam): this doesn't belong in content.
 CONTENT_EXPORT extern const char kNaClBrokerProcess[];
 CONTENT_EXPORT extern const char kNaClLoaderProcess[];
-// TODO(bradchen): remove kNaClLinuxHelper switch.
-// This switch enables the experimental lightweight nacl_helper for Linux.
-// It will be going away soon, when the helper is enabled permanently.
-extern const char kNaClLinuxHelper[];
 extern const char kNoJsRandomness[];
 CONTENT_EXPORT extern const char kNoReferrers[];
 CONTENT_EXPORT extern const char kNoSandbox[];
@@ -172,7 +166,6 @@ extern const char kTouchOptimizedUI[];
 extern const char kTraceStartup[];
 extern const char kTraceStartupFile[];
 extern const char kTraceStartupDuration[];
-extern const char kUnlimitedQuotaForFiles[];
 CONTENT_EXPORT extern const char kUserAgent[];
 extern const char kUtilityCmdPrefix[];
 CONTENT_EXPORT extern const char kUtilityProcess[];
diff --git a/gpu/demos/run_demo_ppapi.sh b/gpu/demos/run_demo_ppapi.sh
index fba5ad1..4f5e6fa 100755
--- a/gpu/demos/run_demo_ppapi.sh
+++ b/gpu/demos/run_demo_ppapi.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -22,7 +22,7 @@ CHROME_SRC="$(dirname "$(dirname "$(dirname "$(readlink -f "$0")")")")"
 PLUGIN_LIB="$CHROME_SRC/out/Debug/lib${1}_ppapi.so"
 PLUGIN_MIME="pepper-application/x-gpu-demo"
 cd "$CHROME_SRC"
-make "${1}_ppapi" && out/Debug/chrome --use-gl=osmesa --enable-gpu-plugin \
+make "${1}_ppapi" && out/Debug/chrome --use-gl=osmesa \
     "${CHROME_DEBUG}" \
     --register-pepper-plugins="$PLUGIN_LIB;$PLUGIN_MIME" \
     "file://$CHROME_SRC/gpu/demos/pepper_gpu_demo.html"
diff --git a/ui/gfx/compositor/compositor_switches.cc b/ui/gfx/compositor/compositor_switches.cc
index e006d06..4543db9 100644
--- a/ui/gfx/compositor/compositor_switches.cc
+++ b/ui/gfx/compositor/compositor_switches.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -10,9 +10,6 @@ const char kDisableTestCompositor[] = "disable-test-compositor";
 
 const char kDisableUIVsync[] = "disable-ui-vsync";
 
-const char kEnableCompositorOverdrawDebugging[] =
-    "enable-compositor-overdraw-debugging";
-
 const char kUIEnablePartialSwap[] = "ui-enable-partial-swap";
 
 // Show FPS counter.
diff --git a/ui/gfx/compositor/compositor_switches.h b/ui/gfx/compositor/compositor_switches.h
index 1f06c6e..674a2d3 100644
--- a/ui/gfx/compositor/compositor_switches.h
+++ b/ui/gfx/compositor/compositor_switches.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_COMPOSITOR_SWITCHES_H_
-#define UI_GFX_COMPOSITOR_SWITCHES_H_
+#ifndef UI_GFX_COMPOSITOR_COMPOSITOR_SWITCHES_H_
+#define UI_GFX_COMPOSITOR_COMPOSITOR_SWITCHES_H_
 #pragma once
 
 #include "ui/gfx/compositor/compositor_export.h"
@@ -12,7 +12,6 @@ namespace switches {
 
 COMPOSITOR_EXPORT extern const char kDisableTestCompositor[];
 COMPOSITOR_EXPORT extern const char kDisableUIVsync[];
-COMPOSITOR_EXPORT extern const char kEnableCompositorOverdrawDebugging[];
 COMPOSITOR_EXPORT extern const char kUIEnablePartialSwap[];
 COMPOSITOR_EXPORT extern const char kUIShowFPSCounter[];
 COMPOSITOR_EXPORT extern const char kUIShowLayerBorders[];
@@ -20,4 +19,4 @@ COMPOSITOR_EXPORT extern const char kUIShowLayerTree[];
 
 }  // namespace switches
 
-#endif  // UI_GFX_COMPOSITOR_SWITCHES_H_
+#endif  // UI_GFX_COMPOSITOR_COMPOSITOR_SWITCHES_H_