Revert "Reland "[permissions] Add browsertest for approximate geolocation flow""

This reverts commit 1de8507.

Reason for revert: test failures in crbug.com/452645984

Original change's description:
> Reland "[permissions] Add browsertest for approximate geolocation flow"
>
> This is a reland of commit 9d3515e
>
> Original change's description:
> > [permissions] Add browsertest for approximate geolocation flow
> >
> > This CL adds a browsertest that verifies the flow for requesting
> > geolocation permission with the approximate/precise option when only
> > approximate location is granted.
> >
> > The test needs to be on Android because the feature is not implemented
> > on desktop yet.
> >
> > Bug: 393053278
> > Change-Id: Ic6fbc6ecf1d0e77e92392a73d5e83cf940009edd
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7035572
> > Reviewed-by: Andy Paicu <[email protected]>
> > Commit-Queue: Antonio Sartori <[email protected]>
> > Reviewed-by: Christian Dullweber <[email protected]>
> > Cr-Commit-Position: refs/heads/main@{#1530773}
>
> Bug: 393053278
> Change-Id: I3a1cc994a993669309fe5125e6b2f5dcacfd514e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7052722
> Reviewed-by: Andy Paicu <[email protected]>
> Commit-Queue: Antonio Sartori <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1532195}

Bug: 393053278
Bug: 452645984
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I90ce98cad75acb541d685e1c876768d8fd01e825
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7062057
Bot-Commit: Rubber Stamper <[email protected]>
Auto-Submit: Nate Fischer <[email protected]>
Commit-Queue: Rubber Stamper <[email protected]>
Owners-Override: Nate Fischer <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1532369}

Author: ntfschr-chromium

chrome/browser/permissions/BUILD.gn

@@ -331,22 +331,6 @@ if (!is_android) {
   }
 }
 
-if (is_android) {
-  source_set("android_browser_tests") {
-    testonly = true
-
-    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-
-    sources = [ "android_permission_request_manager_browsertest.cc" ]
-
-    deps = [
-      ":permissions",
-      ":test_support",
-      "//chrome/test:test_support",
-    ]
-  }
-}
-
 if (!is_android && !is_chromeos_device) {
   source_set("interactive_ui_tests") {
     testonly = true

chrome/browser/permissions/android_permission_request_manager_browsertest.cc

@@ -1903,7 +1903,6 @@ if (is_android) {
       "//chrome/browser/password_manager/android:test_support",
       "//chrome/browser/password_manager/factories:password_factory_headers",
       "//chrome/browser/payments:browser_tests",
-      "//chrome/browser/permissions:android_browser_tests",
       "//chrome/browser/policy:browser_tests",
       "//chrome/browser/policy:test_support",
       "//chrome/browser/preloading:test_support",

chrome/test/BUILD.gn

@@ -143,7 +143,9 @@ void GeolocationPermissionContextAndroid::RequestPermission(
                                 .status;
   if (!request_data->IsEmbeddedPermissionElementInitiated() &&
       (status == PermissionStatus::GRANTED) &&
-      ShouldRepromptUser(web_contents)) {
+      ShouldRepromptUserForPermissions(web_contents,
+                                       {content_settings_type()}) ==
+          PermissionRepromptState::kShow) {
     if (auto* manager =
             PermissionRequestManager::FromWebContents(web_contents)) {
       if (manager->IsCurrentRequestEmbeddedPermissionElementInitiated() &&
@@ -490,12 +492,4 @@ void GeolocationPermissionContextAndroid::SetLocationSettingsForTesting(
   location_settings_ = std::move(settings);
 }
 
-bool GeolocationPermissionContextAndroid::ShouldRepromptUser(
-    content::WebContents* web_contents) {
-  return should_reprompt_user_for_testing_.value_or(
-      ShouldRepromptUserForPermissions(web_contents,
-                                       {content_settings_type()}) ==
-      PermissionRepromptState::kShow);
-}
-
 }  // namespace permissions

components/permissions/contexts/geolocation_permission_context_android.cc

@@ -79,10 +79,6 @@ class GeolocationPermissionContextAndroid
   void SetLocationSettingsForTesting(
       std::unique_ptr<LocationSettings> settings);
 
-  void SetShouldRepromptUserForTesting(bool should_reprompt_user_for_testing) {
-    should_reprompt_user_for_testing_ = should_reprompt_user_for_testing;
-  }
-
  private:
   // GeolocationPermissionContext:
   void RequestPermission(std::unique_ptr<PermissionRequestData> request_data,
@@ -151,8 +147,6 @@ class GeolocationPermissionContextAndroid
                                  PermissionDecision decision,
                                  std::optional<PromptOptions> prompt_options);
 
-  bool ShouldRepromptUser(content::WebContents* web_contents);
-
   std::unique_ptr<LocationSettings> location_settings_;
 
   PermissionRequestID location_settings_dialog_request_id_;
@@ -162,8 +156,6 @@ class GeolocationPermissionContextAndroid
                         BrowserPermissionCallback>>
       pending_reprompt_requests_;
 
-  std::optional<bool> should_reprompt_user_for_testing_;
-
   // Must be the last member, to ensure that it will be destroyed first, which
   // will invalidate weak pointers.
   base::WeakPtrFactory<GeolocationPermissionContextAndroid> weak_factory_{this};

components/permissions/contexts/geolocation_permission_context_android.h

@@ -1595,7 +1595,6 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) {
 }
 
 void PermissionRequestManager::DoAutoResponseForTesting() {
-  SetPromptOptions(auto_response_prompt_options_for_test_);
   // The macOS prompt has its own mechanism of auto responding.
   if (current_request_prompt_disposition_ ==
       PermissionPromptDisposition::MAC_OS_PROMPT) {

components/permissions/permission_request_manager.cc

@@ -28,7 +28,6 @@
 #include "components/permissions/permission_uma_util.h"
 #include "components/permissions/prediction_service/permission_ui_selector.h"
 #include "components/permissions/request_type.h"
-#include "components/permissions/resolvers/permission_prompt_options.h"
 #include "components/tabs/public/tab_interface.h"
 #include "content/public/browser/global_routing_id.h"
 #include "content/public/browser/web_contents.h"
@@ -146,20 +145,13 @@ class PermissionRequestManager
   // Recreates a permission prompt.
   void RestorePrompt();
 
-  // Do NOT use these methods in production code. Use these methods in browser
+  // Do NOT use this methods in production code. Use this methods in browser
   // tests that need to accept or deny permissions when requested in
   // JavaScript. Your test needs to set this appropriately, and then the bubble
   // will proceed as desired as soon as Show() is called.
   void set_auto_response_for_test(AutoResponseType response) {
     auto_response_for_test_ = response;
   }
-  void set_auto_response_prompt_options_for_test(PromptOptions prompt_options) {
-    CHECK_NE(auto_response_for_test_, AutoResponseType::NONE)
-        << "Call set_auto_response_for_test() before calling "
-           "set_auto_response_prompt_options_for_test, since this does not "
-           "have any effect otherwise.";
-    auto_response_prompt_options_for_test_ = std::move(prompt_options);
-  }
 
   // WebContentsObserver:
   void DidStartNavigation(
@@ -544,7 +536,6 @@ class PermissionRequestManager
 
   base::ObserverList<Observer> observer_list_;
   AutoResponseType auto_response_for_test_ = NONE;
-  PromptOptions auto_response_prompt_options_for_test_ = std::monostate();
 
   // Suppress notification permission prompts in this tab, regardless of the
   // origin requesting the permission.