Re-enable more geolocation browser tests.

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 508 matching lines @@
   ExpectPosition(fake_latitude(), fake_longitude());
 
   // The permission is persisted for the regular profile, and inherited by its
   // incognito profile. Go incognito, and check that the user is not prompted
   // again and the position gets to the script.
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_OFFTHERECORD));
   WatchPositionAndObservePermissionRequest(false);
   ExpectPosition(fake_latitude(), fake_longitude());
 }
 
-// http://crbug.com/523387
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
-                       DISABLED_NoLeakFromOffTheRecord) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoLeakFromOffTheRecord) {
   // The user is prompted in a fresh incognito profile, and when granted the
   // position gets to the script.
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_OFFTHERECORD));
   ASSERT_TRUE(WatchPositionAndGrantPermission());
   ExpectPosition(fake_latitude(), fake_longitude());
 
   // The regular profile knows nothing of what happened in incognito. It is
   // prompted and when granted the position gets to the script.
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   ASSERT_TRUE(WatchPositionAndGrantPermission());
@@ skipping 87 matching lines @@
   ASSERT_TRUE(SetPositionAndWaitUntilUpdated(cached_position_latitude,
                                              cached_position_lognitude));
   ExpectPosition(cached_position_latitude, cached_position_lognitude);
 
   // Now check the second frame gets cached values as well.
   SetFrameForScriptExecution("iframe_1");
   ASSERT_TRUE(WatchPositionAndGrantPermission());
   ExpectPosition(cached_position_latitude, cached_position_lognitude);
 }
 
-// http://crbug.com/523387
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
-                       DISABLED_CancelPermissionForFrame) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, CancelPermissionForFrame) {
   set_html_for_tests("/geolocation/two_iframes.html");
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   LoadIFrames();
 
   SetFrameForScriptExecution("iframe_0");
   ASSERT_TRUE(WatchPositionAndGrantPermission());
   ExpectPosition(fake_latitude(), fake_longitude());
 
   // Test second iframe from a different origin with a cached position will
   // create the prompt.
@@ skipping 117 matching lines @@
   // 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);
 }