Revert of Update geolocation permission tests for the permission bubble...

Revert of Update geolocation permission tests for the permission bubble (patchset #18 id:340001 of https://codereview.chromium.org/787033004/)

Reason for revert:
Getting intermittent failures in GeolocationBrowserTest after this patch

Failing build:
https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%281%29/builds/35949/steps/browser_tests

Output:
GeolocationBrowserTestWithParams/GeolocationBrowserTest.NoLeakFromOffTheRecord/1 (run #1):
[ RUN      ] GeolocationBrowserTestWithParams/GeolocationBrowserTest.NoLeakFromOffTheRecord/1
[3952:1032:0204/052930:WARNING:data_reduction_proxy_settings.cc(345)] SPDY proxy OFF at startup
[3952:1032:0204/052930:INFO:legacy_render_widget_host_win.cc(156)] LegacyRenderWidgetHostHWND::OnGetObject message=61 w_param=0 l_param=-12 obj_id=4294967284 host_=00000000
[3952:1032:0204/052930:INFO:legacy_render_widget_host_win.cc(129)] LegacyRenderWidgetHostHWND::Init hwnd=04CF00A6
[3952:1032:0204/052930:WARNING:geolocation_browsertest.cc(383)] before navigate
[3952:1032:0204/052930:INFO:legacy_render_widget_host_win.cc(156)] LegacyRenderWidgetHostHWND::OnGetObject message=61 w_param=0 l_param=-12 obj_id=4294967284 host_=00000000
[3952:1032:0204/052930:INFO:legacy_render_widget_host_win.cc(129)] LegacyRenderWidgetHostHWND::Init hwnd=08B500B0
[3952:1032:0204/052931:WARNING:geolocation_browsertest.cc(398)] after navigate
[3952:1032:0204/052931:WARNING:geolocation_browsertest.cc(234)] will add geolocation watch for bubble
[3952:1032:0204/052931:WARNING:geolocation_browsertest.cc(201)] javascript_response 1
[3952:3868:0204/052931:WARNING:embedded_test_server.cc(248)] Request not handled. Returning 404: /favicon.ico

Output not very helpful here, but perhaps it makes sense to a non-sheriff.

Original issue's description:
> Update geolocation permission tests for the permission bubble
>
> This makes the geolocation permission tests run for both infobars and
> permission bubbles. The tests now run as parameterized tests.
>
> Supercedes parts of:
> https://codereview.chromium.org/411503005/
> https://codereview.chromium.org/341833004/
>
> BUG=438758
>
> Committed: https://crrev.com/f57c61952870c6027dbf220eff8b2d703bfed3c8
> Cr-Commit-Position: refs/heads/master@{#314541}

TBR=mvanouwerkerk@chromium.org,timvolodine@google.com,markusheintz@chromium.org,felt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=438758

Review URL: https://codereview.chromium.org/902643003

Cr-Commit-Position: refs/heads/master@{#314602}

chrome/browser/ui/website_settings/mock_permission_bubble_view.cc

-// Copyright 2015 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 "chrome/browser/ui/website_settings/mock_permission_bubble_view.h"
-
-#include "base/run_loop.h"
-
-MockPermissionBubbleView::MockPermissionBubbleView()
-    : visible_(false),
-      can_accept_updates_(true),
-      delegate_(nullptr),
-      browser_test_(false) {}
-
-MockPermissionBubbleView::~MockPermissionBubbleView() {}
-
-void MockPermissionBubbleView::SetDelegate(Delegate* delegate) {
-  delegate_ = delegate;
-}
-
-void MockPermissionBubbleView::Show(
-    const std::vector<PermissionBubbleRequest*>& requests,
-    const std::vector<bool>& accept_state,
-    bool customization_state_) {
-  visible_ = true;
-  permission_requests_ = requests;
-  permission_states_ = accept_state;
-  if (browser_test_)
-    base::MessageLoopForUI::current()->Quit();
-}
-
-void MockPermissionBubbleView::Hide() {
-  visible_ = false;
-}
-
-bool MockPermissionBubbleView::IsVisible() {
-  return visible_;
-}
-
-bool MockPermissionBubbleView::CanAcceptRequestUpdate() {
-  return can_accept_updates_;
-}
-
-void MockPermissionBubbleView::Accept() {
-  delegate_->Accept();
-}
-
-void MockPermissionBubbleView::Deny() {
-  delegate_->Deny();
-}
-
-void MockPermissionBubbleView::Close() {
-  delegate_->Closing();
-}
-
-void MockPermissionBubbleView::Clear() {
-  visible_ = false;
-  can_accept_updates_ = true;
-  delegate_ = nullptr;
-  permission_requests_.clear();
-  permission_states_.clear();
-}
-
-void MockPermissionBubbleView::SetBrowserTest(bool browser_test) {
-  browser_test_ = browser_test;
-}

chrome/browser/ui/website_settings/mock_permission_bubble_view.h

-// Copyright 2015 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.
-
-#ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_VIEW_H_
-#define CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_VIEW_H_
-
-#include "chrome/browser/ui/website_settings/permission_bubble_request.h"
-#include "chrome/browser/ui/website_settings/permission_bubble_view.h"
-
-// Provides a skeleton class for unit testing, when trying to test the bubble
-// manager logic. Should not be used for anything that requires actual UI.
-// See example usage in
-// chrome/browser/geolocation/geolocation_permission_context_unittest.cc.
-class MockPermissionBubbleView : public PermissionBubbleView {
- public:
-  MockPermissionBubbleView();
-  ~MockPermissionBubbleView() override;
-
-  // PermissionBubbleView:
-  void SetDelegate(Delegate* delegate) override;
-  void Show(const std::vector<PermissionBubbleRequest*>& requests,
-            const std::vector<bool>& accept_state,
-            bool customization_state_) override;
-  bool CanAcceptRequestUpdate() override;
-  void Hide() override;
-  bool IsVisible() override;
-
-  // Wrappers that update the state of the bubble.
-  void Accept();
-  void Deny();
-  void Close();
-  void Clear();
-
-  // If we're in a browser test, we need to interact with the message loop.
-  // But that shouldn't be done in unit tests.
-  void SetBrowserTest(bool browser_test);
-
- private:
-  bool visible_;
-  bool can_accept_updates_;
-  Delegate* delegate_;
-  bool browser_test_;
-  std::vector<PermissionBubbleRequest*> permission_requests_;
-  std::vector<bool> permission_states_;
-};
-
-#endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_VIEW_H_

chrome/browser/ui/website_settings/permission_bubble_manager.h

@@ -66,9 +66,6 @@ class PermissionBubbleManager
 
  private:
   friend class DownloadRequestLimiterTest;
-  friend class GeolocationBrowserTest;
-  friend class GeolocationPermissionContextTests;
-  friend class GeolocationPermissionContextParamTests;
   friend class PermissionBubbleManagerTest;
   friend class PermissionContextBaseTests;
   friend class content::WebContentsUserData<PermissionBubbleManager>;

chrome/chrome_tests.gypi

@@ -494,8 +494,6 @@
       'browser/ui/toolbar/component_toolbar_actions_browsertest.cc',
       'browser/ui/toolbar/test_toolbar_model.cc',
       'browser/ui/toolbar/test_toolbar_model.h',
-      'browser/ui/website_settings/mock_permission_bubble_view.cc',
-      'browser/ui/website_settings/mock_permission_bubble_view.h',
       'browser/ui/webui/bidi_checker_web_ui_test.cc',
       'browser/ui/webui/bidi_checker_web_ui_test.h',
       'browser/ui/webui/bookmarks_ui_browsertest.cc',

chrome/chrome_tests_unit.gypi

@@ -522,8 +522,6 @@
       'browser/ui/sync/sync_promo_ui_unittest.cc',
       'browser/ui/tests/ui_gfx_image_unittest.cc',
       'browser/ui/tests/ui_gfx_image_unittest.mm',
-      'browser/ui/website_settings/mock_permission_bubble_view.cc',
-      'browser/ui/website_settings/mock_permission_bubble_view.h',
       'browser/ui/website_settings/permission_bubble_manager_unittest.cc',
       'browser/ui/website_settings/website_settings_unittest.cc',
       'browser/ui/webui/fileicon_source_unittest.cc',