Improve permission persistence 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 236 matching lines @@
                              const std::string& function);
 
   // Sets a new (second) position and runs all callbacks currently registered
   // with the Geolocation system. Returns |true| if the new position is updated
   // successfully in JavaScript.
   bool SetPositionAndWaitUntilUpdated(double latitude, double longitude);
 
   // Convenience method to look up the number of queued permission requests.
   int GetRequestQueueSize(PermissionRequestManager* manager);
 
+  // Toggle whether the prompt decision should be persisted.
+  void TogglePersist(bool persist);
+
  private:
   // Calls watchPosition() in JavaScript and accepts or denies the resulting
   // permission request. Returns the JavaScript response.
   std::string WatchPositionAndRespondToPermissionRequest(
       PermissionRequestManager::AutoResponseType request_response);
 
   // The current Browser as set in Initialize. May be for an incognito profile.
   Browser* current_browser_ = nullptr;
 
   // The path element of a URL referencing the html content for this test.
@@ skipping 155 matching lines @@
   std::string result =
       RunScript(render_frame_host_, "checkIfGeopositionUpdated()");
   return result == "geoposition-updated";
 }
 
 int GeolocationBrowserTest::GetRequestQueueSize(
     PermissionRequestManager* manager) {
   return static_cast<int>(manager->requests_.size());
 }
 
+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) {
   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()));

[raymes, 2016/09/15 05:16:08]

Maybe we could do WatchPositionAndObservePermissionRequest(false) instead of
checking the setting? Actually I think this case is already covered so it might
be ok not to test this

[dominickn, 2016/09/15 05:40:29]

Done.

 }
 
 #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) {
   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()));

[raymes, 2016/09/15 05:16:08]

Same with this (see below)

[dominickn, 2016/09/15 05:40:29]

Done.

 }
 
 #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) {
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
@@ skipping 62 matching lines @@
   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());
   ExpectPosition(fake_latitude(), fake_longitude());
 }
 
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TogglePersistGranted) {
+  // Initialize and turn persistence off.
+  ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
+  TogglePersist(false);
+
+  ASSERT_TRUE(WatchPositionAndGrantPermission());
+  EXPECT_EQ(CONTENT_SETTING_ASK,
+            GetHostContentSettingsMap()->GetContentSetting(
+                current_url(), current_url(), CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                std::string()));

[raymes, 2016/09/15 05:16:08]

Can we do WatchPositionAndObservePermissionRequest(true)? I think that should
cover the codepath of actually re-requesting position and making sure the prompt
pops up again.

[dominickn, 2016/09/15 05:40:29]

Done.

+}
+
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TogglePersistBlocked) {
+  // Initialize and turn persistence off.
+  ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
+  TogglePersist(false);
+
+  ASSERT_TRUE(WatchPositionAndDenyPermission());
+  EXPECT_EQ(CONTENT_SETTING_ASK,
+            GetHostContentSettingsMap()->GetContentSetting(
+                current_url(), current_url(), CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                std::string()));

[raymes, 2016/09/15 05:16:08]

Same here.

[dominickn, 2016/09/15 05:40:29]

Done.

+}
+
 #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) {
   set_html_for_tests("/geolocation/two_iframes.html");
   ASSERT_NO_FATAL_FAILURE(Initialize(INITIALIZATION_DEFAULT));
   LoadIFrames();
@@ skipping 205 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);
 }