Re-enable disabled geolocation browser tests on Linux.

chrome/browser/geolocation/geolocation_browsertest.cc

Index: chrome/browser/geolocation/geolocation_browsertest.cc
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 74583ce68862e07c0cca5ed509a146034b610a12..69bf70e56c98cbad98f7154a2a8a15a97a4af841 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -441,13 +441,7 @@ void GeolocationBrowserTest::TogglePersist(bool persist) {
 
 // Tests ----------------------------------------------------------------------
 
-#if defined(OS_LINUX)
-// http://crbug.com/527437
-#define MAYBE_DisplaysPrompt DISABLED_DisplaysPrompt
-#else
-#define MAYBE_DisplaysPrompt DisplaysPrompt
-#endif
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_DisplaysPrompt) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DisplaysPrompt) {
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   ASSERT_TRUE(WatchPositionAndGrantPermission());
 
@@ -460,13 +454,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_DisplaysPrompt) {
   WatchPositionAndObservePermissionRequest(false);
 }
 
-#if defined(OS_LINUX)
-// http://crbug.com/527437
-#define MAYBE_Geoposition DISABLED_Geoposition
-#else
-#define MAYBE_Geoposition Geoposition
-#endif
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_Geoposition) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, Geoposition) {
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   ASSERT_TRUE(WatchPositionAndGrantPermission());
   ExpectPosition(fake_latitude(), fake_longitude());
@@ -486,13 +474,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, ErrorOnPermissionDenied) {
   WatchPositionAndObservePermissionRequest(false);
 }
 
-#if defined(OS_LINUX)
-// http://crbug.com/527437
-#define MAYBE_NoPromptForSecondTab DISABLED_NoPromptForSecondTab
-#else
-#define MAYBE_NoPromptForSecondTab NoPromptForSecondTab
-#endif
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoPromptForSecondTab) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoPromptForSecondTab) {
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   ASSERT_TRUE(WatchPositionAndGrantPermission());
 
@@ -518,13 +500,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoPromptForDeniedOrigin) {
   ExpectValueFromScript(GetErrorCodePermissionDenied(), "geoGetLastError()");
 }
 
-#if defined(OS_LINUX)
-// http://crbug.com/527437
-#define MAYBE_NoPromptForAllowedOrigin DISABLED_NoPromptForAllowedOrigin
-#else
-#define MAYBE_NoPromptForAllowedOrigin NoPromptForAllowedOrigin
-#endif
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoPromptForAllowedOrigin) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoPromptForAllowedOrigin) {
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       current_url(), current_url(), CONTENT_SETTINGS_TYPE_GEOLOCATION,
@@ -606,13 +582,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TogglePersistBlocked) {
   WatchPositionAndObservePermissionRequest(true);
 }
 
-#if defined(OS_LINUX)
-// http://crbug.com/527437
-#define MAYBE_IFramesWithFreshPosition DISABLED_IFramesWithFreshPosition
-#else
-#define MAYBE_IFramesWithFreshPosition IFramesWithFreshPosition
-#endif
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_IFramesWithFreshPosition) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, IFramesWithFreshPosition) {
   set_html_for_tests("/geolocation/two_iframes.html");
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   LoadIFrames();
@@ -642,14 +612,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_IFramesWithFreshPosition) {
   ExpectPosition(fresh_position_latitude, fresh_position_longitude);
 }
 
-#if defined(OS_LINUX)
-// http://crbug.com/527437
-#define MAYBE_IFramesWithCachedPosition DISABLED_IFramesWithCachedPosition
-#else
-#define MAYBE_IFramesWithCachedPosition IFramesWithCachedPosition
-#endif
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
-                       MAYBE_IFramesWithCachedPosition) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, IFramesWithCachedPosition) {
   set_html_for_tests("/geolocation/two_iframes.html");
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   LoadIFrames();
@@ -711,13 +674,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, InvalidUrlRequest) {
   ExpectValueFromScriptForFrame("1", "isAlive()", original_tab->GetMainFrame());
 }
 
-#if defined(OS_LINUX)
-// http://crbug.com/527437
-#define MAYBE_NoPromptBeforeStart DISABLED_NoPromptBeforeStart
-#else
-#define MAYBE_NoPromptBeforeStart NoPromptBeforeStart
-#endif
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoPromptBeforeStart) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoPromptBeforeStart) {
   // See http://crbug.com/42789
   set_html_for_tests("/geolocation/two_iframes.html");
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
@@ -741,13 +698,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoPromptBeforeStart) {
   ExpectPosition(fake_latitude(), fake_longitude());
 }
 
-#if defined(OS_LINUX)
-// http://crbug.com/527437
-#define MAYBE_TwoWatchesInOneFrame DISABLED_TwoWatchesInOneFrame
-#else
-#define MAYBE_TwoWatchesInOneFrame TwoWatchesInOneFrame
-#endif
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_TwoWatchesInOneFrame) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) {
   set_html_for_tests("/geolocation/two_watches.html");
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
 
@@ -795,13 +746,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TabDestroyed) {
       current_browser()->tab_strip_model()->GetActiveWebContents(), script));
 }
 
-#if defined(OS_LINUX)
-// http://crbug.com/527437
-#define MAYBE_LastUsageUpdated DISABLED_LastUsageUpdated
-#else
-#define MAYBE_LastUsageUpdated LastUsageUpdated
-#endif
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_LastUsageUpdated) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, LastUsageUpdated) {
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   base::SimpleTestClock* clock_ = new base::SimpleTestClock();
   GetHostContentSettingsMap()->SetPrefClockForTesting(