Re-enable disabled geolocation browser tests on Linux.

chrome/browser/geolocation/geolocation_browsertest.cc

 // 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.
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 423 matching lines @@
 
 void GeolocationBrowserTest::TogglePersist(bool persist) {
   content::WebContents* web_contents =
       current_browser()->tab_strip_model()->GetActiveWebContents();
   PermissionRequestManager::FromWebContents(web_contents)
       ->TogglePersist(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());
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetHostContentSettingsMap()->GetContentSetting(
                 current_url(), current_url(), CONTENT_SETTINGS_TYPE_GEOLOCATION,
                 std::string()));
 
   // Ensure a second request doesn't create a prompt in this tab.
   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());
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, ErrorOnPermissionDenied) {
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   EXPECT_TRUE(WatchPositionAndDenyPermission());
   ExpectValueFromScript(GetErrorCodePermissionDenied(), "geoGetLastError()");
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetHostContentSettingsMap()->GetContentSetting(
                 current_url(), current_url(), CONTENT_SETTINGS_TYPE_GEOLOCATION,
                 std::string()));
 
   // Ensure a second request doesn't create a prompt in this tab.
   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());
 
   // Checks request is not needed in a second tab.
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_NEWTAB));
   WatchPositionAndObservePermissionRequest(false);
   ExpectPosition(fake_latitude(), fake_longitude());
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoPromptForDeniedOrigin) {
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       current_url(), current_url(), CONTENT_SETTINGS_TYPE_GEOLOCATION,
       std::string(), CONTENT_SETTING_BLOCK);
 
   // Check that the request wasn't shown but we get an error for this origin.
   WatchPositionAndObservePermissionRequest(false);
   ExpectValueFromScript(GetErrorCodePermissionDenied(), "geoGetLastError()");
 
   // Checks prompt will not be created a second tab.
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_NEWTAB));
   WatchPositionAndObservePermissionRequest(false);
   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,
       std::string(), CONTENT_SETTING_ALLOW);
   // The request is not shown, there is no error, and the position gets to the
   // script.
   WatchPositionAndObservePermissionRequest(false);
   ExpectPosition(fake_latitude(), fake_longitude());
 }
 
@@ skipping 61 matching lines @@
 
   // Expect the block to be remembered at the blink layer, so a second request
   // on this page doesn't create a request.
   WatchPositionAndObservePermissionRequest(false);
 
   // Navigate and ensure that a prompt is shown when we request again.
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   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();
 
   // Grant permission in the first frame, the position gets to the script.
   SetFrameForScriptExecution("iframe_0");
   ASSERT_TRUE(WatchPositionAndGrantPermission());
   ExpectPosition(fake_latitude(), fake_longitude());
 
   // In a second iframe from a different origin with a cached position the user
   // is prompted.
   SetFrameForScriptExecution("iframe_1");
   WatchPositionAndObservePermissionRequest(true);
 
   // Back to the first frame, enable navigation and refresh geoposition.
   SetFrameForScriptExecution("iframe_0");
   double fresh_position_latitude = 3.17;
   double fresh_position_longitude = 4.23;
   ASSERT_TRUE(SetPositionAndWaitUntilUpdated(fresh_position_latitude,
                                              fresh_position_longitude));
   ExpectPosition(fresh_position_latitude, fresh_position_longitude);
 
   // When permission is granted to the second iframe the fresh position gets to
   // the script.
   SetFrameForScriptExecution("iframe_1");
   ASSERT_TRUE(WatchPositionAndGrantPermission());
   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();
 
   // Grant permission in the first frame, the position gets to the script.
   SetFrameForScriptExecution("iframe_0");
   ASSERT_TRUE(WatchPositionAndGrantPermission());
   ExpectPosition(fake_latitude(), fake_longitude());
 
   // Refresh the position, but let's not yet create the watch on the second
@@ skipping 41 matching lines @@
   set_html_for_tests("/geolocation/invalid_request_url.html");
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
 
   content::WebContents* original_tab =
       current_browser()->tab_strip_model()->GetActiveWebContents();
   ExpectValueFromScript(GetErrorCodePermissionDenied(),
                         "requestGeolocationFromInvalidUrl()");
   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));
   LoadIFrames();
 
   // In the second iframe, access the navigator.geolocation object, but don't
   // call any methods yet so it won't request permission yet.
   SetFrameForScriptExecution("iframe_1");
   ExpectValueFromScript("object", "geoAccessNavigatorGeolocation()");
 
   // In the first iframe, call watchPosition, grant permission, and verify that
   // the position gets to the script.
   SetFrameForScriptExecution("iframe_0");
   ASSERT_TRUE(WatchPositionAndGrantPermission());
   ExpectPosition(fake_latitude(), fake_longitude());
 
   // Back to the second frame. The user is prompted now (it has a different
   // origin). When permission is granted the position gets to the script.
   SetFrameForScriptExecution("iframe_1");
   ASSERT_TRUE(WatchPositionAndGrantPermission());
   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));
 
   // Tell the script what to expect as the final coordinates.
   double final_position_latitude = 3.17;
   double final_position_longitude = 4.23;
   std::string script =
       base::StringPrintf("geoSetFinalPosition(%f, %f)", final_position_latitude,
                          final_position_longitude);
   ExpectValueFromScript("ok", script);
@@ skipping 27 matching lines @@
   WatchPositionAndObservePermissionRequest(true);
 
   // TODO(mvanouwerkerk): Can't close a window you did not open. Maybe this was
   // valid when the test was written, but now it just prints "Scripts may close
   // only the windows that were opened by it."
   std::string script = "window.domAutomationController.send(window.close())";
   ASSERT_TRUE(content::ExecuteScript(
       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(
       std::unique_ptr<base::Clock>(clock_));
   clock_->SetNow(base::Time::UnixEpoch() + base::TimeDelta::FromSeconds(10));
 
   // Setting the permission should trigger the last usage.
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       current_url(), current_url(), CONTENT_SETTINGS_TYPE_GEOLOCATION,
       std::string(), CONTENT_SETTING_ALLOW);
 
   // Permission has been used at the starting time.
   EXPECT_EQ(GetHostContentSettingsMap()->GetLastUsage(
       current_url().GetOrigin(),
       current_url().GetOrigin(),
       CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(), 10);
 
   clock_->Advance(base::TimeDelta::FromSeconds(3));
 
   // Calling watchPosition should trigger the last usage update.
   WatchPositionAndObservePermissionRequest(false);
   ExpectPosition(fake_latitude(), fake_longitude());
 
   // Last usage has been updated.
   EXPECT_EQ(GetHostContentSettingsMap()->GetLastUsage(
       current_url().GetOrigin(),
       current_url().GetOrigin(),
       CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(), 13);
 }