4 files changed, 6 insertions, 10 deletions
diff --git a/chrome/browser/geolocation/core_location_provider_mac.mm b/chrome/browser/geolocation/core_location_provider_mac.mm
index e410426..deb92c9 100644
--- a/chrome/browser/geolocation/core_location_provider_mac.mm
+++ b/chrome/browser/geolocation/core_location_provider_mac.mm
@@ -44,7 +44,7 @@ void CoreLocationProviderMac::SetPosition(Geoposition* position) {
 
 LocationProviderBase* NewSystemLocationProvider() {
   if(CommandLine::ForCurrentProcess()
-     ->HasSwitch(switches::kEnableCoreLocation)) {
+     ->HasSwitch(switches::kExperimentalLocationFeatures)) {
     return new CoreLocationProviderMac;
   }
   return NULL;
diff --git a/chrome/browser/geolocation/win7_location_api_win.cc b/chrome/browser/geolocation/win7_location_api_win.cc
index 18bda1b..7b6c3ca 100644
--- a/chrome/browser/geolocation/win7_location_api_win.cc
+++ b/chrome/browser/geolocation/win7_location_api_win.cc
@@ -42,7 +42,7 @@ Win7LocationApi::~Win7LocationApi() {
 
 Win7LocationApi* Win7LocationApi::Create() {
   if (!CommandLine::ForCurrentProcess()
-      ->HasSwitch(switches::kEnableWin7Location))
+      ->HasSwitch(switches::kExperimentalLocationFeatures))
     return NULL;
   // Load probsys.dll
   string16 lib_needed = L"propsys.dll";
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index f93210c..f3ee9f3 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -394,9 +394,6 @@ const char kEnableConnectBackupJobs[]       = "enable-connect-backup-jobs";
 // Link: headers.
 const char kEnableContentPrefetch[]         = "enable-content-prefetch";
 
-// Enable CoreLocation geoposition data provider
-const char kEnableCoreLocation[]            = "enable-core-location";
-
 // Enables device motion events.
 const char kEnableDeviceMotion[]            = "enable-device-motion";
 
@@ -550,13 +547,14 @@ const char kEnableVideoLogging[]            = "enable-video-logging";
 // Order of the listed sub-arguments does not matter.
 const char kEnableWatchdog[]                = "enable-watchdog";
 
-// Enables Windows 7 Location Platform provider for geolocation API.
-const char kEnableWin7Location[]            = "enable-win7-location";
-
 // Disable WebKit's XSSAuditor.  The XSSAuditor mitigates reflective XSS.
 const char kEnableXSSAuditor[]              = "enable-xss-auditor";
 
 // Enables experimental features for the geolocation API.
+// Current features:
+// - CoreLocation support for Mac OS X 10.6
+// - Gateway location for Windows
+// - Location platform support for Windows 7
 const char kExperimentalLocationFeatures[]  = "experimental-location-features";
 
 // Enables experimental features for Spellchecker. Right now, the first
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index f6c1c27..e9fa031 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -122,7 +122,6 @@ extern const char kEnableCloudPrintProxy[];
 extern const char kEnableCloudPrint[];
 extern const char kEnableConnectBackupJobs[];
 extern const char kEnableContentPrefetch[];
-extern const char kEnableCoreLocation[];
 extern const char kEnableDeviceMotion[];
 extern const char kEnableDNSSECCerts[];
 extern const char kEnableExperimentalExtensionApis[];
@@ -168,7 +167,6 @@ extern const char kEnableVideoFullscreen[];
 extern const char kEnableVideoLayering[];
 extern const char kEnableVideoLogging[];
 extern const char kEnableWatchdog[];
-extern const char kEnableWin7Location[];
 extern const char kEnableXSSAuditor[];
 // Experimental features.
 extern const char kExperimentalLocationFeatures[];