Reflect device status in geolocation permissions.request calls.

chrome/browser/geolocation/geolocation_permission_context_unittest.cc

Index: chrome/browser/geolocation/geolocation_permission_context_unittest.cc
diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
index d79b18c3d4e30ff3fb11d36d75d5ca3b32f29e0c..290afb002f7e93242a1b9086bb0030d29906525f 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
@@ -58,6 +58,7 @@
 #include "chrome/browser/geolocation/geolocation_permission_context_android.h"
 #include "components/location/android/location_settings_dialog_outcome.h"
 #include "components/prefs/pref_service.h"
+#include "content/public/browser/permission_type.h"
 #include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
 #else
 #include "chrome/browser/permissions/permission_request_manager.h"
@@ -182,6 +183,9 @@ class GeolocationPermissionContextTests
   void RequestManagerDocumentLoadCompleted();
   void RequestManagerDocumentLoadCompleted(content::WebContents* web_contents);
   ContentSetting GetGeolocationContentSetting(GURL frame_0, GURL frame_1);
+  void SetGeolocationContentSetting(GURL frame_0,
+                                    GURL frame_1,
+                                    ContentSetting content_setting);
   size_t GetNumberOfPrompts();
   void AcceptPrompt();
   base::string16 GetPromptText();
@@ -391,6 +395,16 @@ ContentSetting GeolocationPermissionContextTests::GetGeolocationContentSetting(
                           std::string());
 }
 
+void GeolocationPermissionContextTests::SetGeolocationContentSetting(
+    GURL frame_0,
+    GURL frame_1,
+    ContentSetting content_setting) {
+  return HostContentSettingsMapFactory::GetForProfile(profile())
+      ->SetContentSettingDefaultScope(frame_0, frame_1,
+                                      CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                                      std::string(), content_setting);
+}
+
 size_t GeolocationPermissionContextTests::GetNumberOfPrompts() {
 #if !defined(OS_ANDROID)
   PermissionRequestManager* manager =
@@ -1011,4 +1025,119 @@ TEST_F(GeolocationPermissionContextTests, SearchGeolocationInIncognito) {
                                       requesting_frame, requesting_frame)
                 .content_setting);
 }
+
+TEST_F(GeolocationPermissionContextTests,
+       GeolocationStatusAndroidDisabledLegacy) {
+  GURL requesting_frame("https://www.example.com/geolocation");
+
+  // In these tests the Android permission status should not be taken into
+  // account, only the content setting.
+  SetGeolocationContentSetting(requesting_frame, requesting_frame,
+                               CONTENT_SETTING_ALLOW);
+  MockLocationSettings::SetLocationStatus(false /* android */,
+                                          true /* system */);
+  ASSERT_EQ(blink::mojom::PermissionStatus::GRANTED,
+            PermissionManager::Get(profile())->GetPermissionStatus(
+                content::PermissionType::GEOLOCATION, requesting_frame,
+                requesting_frame));
+
+  SetGeolocationContentSetting(requesting_frame, requesting_frame,
+                               CONTENT_SETTING_BLOCK);
+  MockLocationSettings::SetLocationStatus(false /* android */,
+                                          true /* system */);
+  ASSERT_EQ(blink::mojom::PermissionStatus::DENIED,
+            PermissionManager::Get(profile())->GetPermissionStatus(
+                content::PermissionType::GEOLOCATION, requesting_frame,
+                requesting_frame));
+}
+
+TEST_F(GeolocationPermissionContextTests, GeolocationStatusAndroidDisabled) {
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitAndEnableFeature(features::kLsdPermissionPrompt);
+
+  GURL requesting_frame("https://www.example.com/geolocation");
+
+  // With the Android permission off, but location allowed for a domain, the
+  // permission status should be ASK.
+  SetGeolocationContentSetting(requesting_frame, requesting_frame,
+                               CONTENT_SETTING_ALLOW);
+  MockLocationSettings::SetLocationStatus(false /* android */,
+                                          true /* system */);
+  ASSERT_EQ(blink::mojom::PermissionStatus::ASK,
+            PermissionManager::Get(profile())->GetPermissionStatus(
+                content::PermissionType::GEOLOCATION, requesting_frame,
+                requesting_frame));
+
+  // With the Android permission off, and location blocked for a domain, the
+  // permission status should still be BLOCK.
+  SetGeolocationContentSetting(requesting_frame, requesting_frame,
+                               CONTENT_SETTING_BLOCK);
+  MockLocationSettings::SetLocationStatus(false /* android */,
+                                          true /* system */);
+  ASSERT_EQ(blink::mojom::PermissionStatus::DENIED,
+            PermissionManager::Get(profile())->GetPermissionStatus(
+                content::PermissionType::GEOLOCATION, requesting_frame,
+                requesting_frame));
+}
+
+TEST_F(GeolocationPermissionContextTests,
+       GeolocationStatusSystemDisabledLegacy) {
+  GURL requesting_frame("https://www.example.com/geolocation");
+
+  // In these tests the system permission status should not be taken into
+  // account, only the content setting.
+  SetGeolocationContentSetting(requesting_frame, requesting_frame,
+                               CONTENT_SETTING_ALLOW);
+  MockLocationSettings::SetLocationStatus(true /* android */,
+                                          false /* system */);
+  ASSERT_EQ(blink::mojom::PermissionStatus::GRANTED,
+            PermissionManager::Get(profile())->GetPermissionStatus(
+                content::PermissionType::GEOLOCATION, requesting_frame,
+                requesting_frame));
+
+  SetGeolocationContentSetting(requesting_frame, requesting_frame,
+                               CONTENT_SETTING_BLOCK);
+  MockLocationSettings::SetLocationStatus(true /* android */,
+                                          false /* system */);
+  ASSERT_EQ(blink::mojom::PermissionStatus::DENIED,
+            PermissionManager::Get(profile())->GetPermissionStatus(
+                content::PermissionType::GEOLOCATION, requesting_frame,
+                requesting_frame));
+}
+
+TEST_F(GeolocationPermissionContextTests, GeolocationStatusSystemDisabled) {
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitAndEnableFeature(features::kLsdPermissionPrompt);
+
+  GURL requesting_frame("https://www.example.com/geolocation");
+
+  // With the system permission off, but location allowed for a domain, the
+  // permission status should be reflect whether the LSD can be shown.
+  SetGeolocationContentSetting(requesting_frame, requesting_frame,
+                               CONTENT_SETTING_ALLOW);

[raymes, 2017/03/10 02:53:31]

nit: Should we add a case for each of these where the setting is the default
(e.g. ASK)?

[benwells, 2017/03/10 04:19:19]

Done.

+  MockLocationSettings::SetLocationStatus(true /* android */,
+                                          false /* system */);
+  ASSERT_EQ(blink::mojom::PermissionStatus::ASK,
+            PermissionManager::Get(profile())->GetPermissionStatus(
+                content::PermissionType::GEOLOCATION, requesting_frame,
+                requesting_frame));
+
+  MockLocationSettings::SetLocationSettingsDialogStatus(false, GRANTED);
+  ASSERT_EQ(blink::mojom::PermissionStatus::DENIED,
+            PermissionManager::Get(profile())->GetPermissionStatus(
+                content::PermissionType::GEOLOCATION, requesting_frame,
+                requesting_frame));
+
+  // With the Android permission off, and location blocked for a domain, the
+  // permission status should still be BLOCK.
+  SetGeolocationContentSetting(requesting_frame, requesting_frame,
+                               CONTENT_SETTING_BLOCK);
+  MockLocationSettings::SetLocationStatus(false /* android */,
+                                          true /* system */);
+  MockLocationSettings::SetLocationSettingsDialogStatus(true, GRANTED);
+  ASSERT_EQ(blink::mojom::PermissionStatus::DENIED,
+            PermissionManager::Get(profile())->GetPermissionStatus(
+                content::PermissionType::GEOLOCATION, requesting_frame,
+                requesting_frame));
+}
 #endif  // defined(OS_ANDROID)