Flip the flag to enable geolocation by default.

BUG=39808
TEST=run browser with & withou --disable-geolocaiton.

Review URL: http://codereview.chromium.org/1534008

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

6 files changed, 9 insertions, 15 deletions

diff --git a/chrome/browser/extensions/extension_geolocation_apitest.cc b/chrome/browser/extensions/extension_geolocation_apitest.cc
index 68ce380..5baa272 100644
--- a/chrome/browser/extensions/extension_geolocation_apitest.cc
+++ b/chrome/browser/extensions/extension_geolocation_apitest.cc
@@ -9,9 +9,9 @@
 
 class GeolocationApiTest : public ExtensionApiTest {
 public:
-  void SetUpCommandLine(CommandLine* command_line) {
-    ExtensionApiTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableGeolocation);
+  // InProcessBrowserTest
+  void SetUpInProcessBrowserTestFixture() {
+    ExtensionApiTest::SetUpInProcessBrowserTestFixture();
     GeolocationArbitrator::SetProviderFactoryForTest(
         &NewAutoSuccessMockLocationProvider);
   }
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 0ecaa93..9f871a8 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -306,12 +306,6 @@ class GeolocationBrowserTest : public InProcessBrowserTest {
     EXPECT_EQ(expected.c_str(), result);
   }
 
-  // InProcessBrowserTest
-  virtual void SetUpCommandLine(CommandLine* command_line) {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableGeolocation);
-  }
-
   scoped_refptr<HTTPTestServer> server_;
   InfoBarDelegate* infobar_;
   Browser* current_browser_;
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 88cf631..8f2e90c 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -547,7 +547,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kDisableSharedWorkers,
     switches::kDisableApplicationCache,
     switches::kEnableIndexedDatabase,
-    switches::kEnableGeolocation,
+    switches::kDisableGeolocation,
     switches::kShowPaintRects,
     switches::kEnableOpenMax,
     switches::kEnableVideoLayering,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index a9a9b42..817acf1 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -113,6 +113,9 @@ const char kDisableDevTools[]               = "disable-dev-tools";
 // Disable extensions.
 const char kDisableExtensions[]             = "disable-extensions";
 
+// Suppresses support for the Geolocation javascript API.
+const char kDisableGeolocation[]             = "disable-geolocation";
+
 // Suppresses hang monitor dialogs in renderer processes.
 const char kDisableHangMonitor[]            = "disable-hang-monitor";
 
@@ -244,9 +247,6 @@ const char kEnableFastback[]                = "enable-fastback";
 // testing, for example page cycler and layout tests.  See bug 1157243.
 const char kEnableFileCookies[]             = "enable-file-cookies";
 
-// Enable Geolocation support.
-const char kEnableGeolocation[]             = "enable-geolocation";
-
 // Enable the Indexed Database API.
 const char kEnableIndexedDatabase[]         = "enable-indexed-database";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index c2b50bf..75652eb 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -47,6 +47,7 @@ extern const char kDisableDatabases[];
 extern const char kDisableDesktopNotifications[];
 extern const char kDisableDevTools[];
 extern const char kDisableExtensions[];
+extern const char kDisableGeolocation[];
 extern const char kDisableHangMonitor[];
 extern const char kDisableIPv6[];
 extern const char kDisableJavaScript[];
@@ -85,7 +86,6 @@ extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableExtensionToolstrips[];
 extern const char kEnableFastback[];
 extern const char kEnableFileCookies[];
-extern const char kEnableGeolocation[];
 extern const char kEnableGPUPlugin[];
 extern const char kEnableGPURendering[];
 extern const char kEnableIndexedDatabase[];
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index c40ef64..19c453e 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -870,7 +870,7 @@ void RenderThread::EnsureWebKitInitialized() {
       command_line.HasSwitch(switches::kEnableIndexedDatabase));
 
   WebRuntimeFeatures::enableGeolocation(
-      command_line.HasSwitch(switches::kEnableGeolocation));
+      !command_line.HasSwitch(switches::kDisableGeolocation));
 
   WebRuntimeFeatures::enableWebGL(
       command_line.HasSwitch(switches::kEnableExperimentalWebGL));