Revert "Add RenderFrameHost as parameter to WebContentsDelegate::Hand…

…leContextMenu"

This reverts commit 5705b91.

Reason for revert: Suspect this caused a failure in content_unittests on Android CFI: https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Android%20CFI/4518

Original change's description:
> Add RenderFrameHost as parameter to WebContentsDelegate::HandleContextMenu
> 
> To be able to do anything more complicated than block all context
> menu handling in HandleContextMenu you need the associated WebContents
> object. Current implementation that do something more currently handles
> that by either being a WebContentsObserver or keeping the WebContents
> object some other way.
> 
> After WebContents checks WebContentsDelegate::HandleContextMenu the
> next delegate to get a chance is WebContentsViewDelegate::ShowContextMenu
> which takes a RenderFrameHost as additional parameter. This is all
> you need to get the WebContents object and other related information.
> 
> So, to simplify writing WebContentsDelegate:s and override the
> context menu handling by actually showing something, include
> RenderFrameHost also in the HandleContextMenu call.
> 
> I selected RenderFrameHost instead of WebContents that many
> other delegate methods use because it matches ShowContextMenu
> signature and there are already other delegate methods that
> also uses RenderFrameHost instead.
> 
> WebContentsDelegate is a very popular interface, so this
> modifies a lot of files in different components but the
> changes are mechanical.
> 
> Change-Id: I612202730f9a3badd38062e8284f1d50979e9377
> Bug: 932520
> Reviewed-on: https://chromium-review.googlesource.com/c/1472696
> Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
> Reviewed-by: Jochen Eisinger <jochen@chromium.org>
> Commit-Queue: Joel Klinghed <the_jk@opera.com>
> Cr-Commit-Position: refs/heads/master@{#633300}

TBR=ellyjones@chromium.org,the_jk@opera.com,jochen@chromium.org

Change-Id: I2c23108bebf04fb9248ad799f6e8e3917a93536b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 932520
Reviewed-on: https://chromium-review.googlesource.com/c/1478184
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#633454}

chrome/browser/chromeos/accessibility/accessibility_panel.cc

@@ -127,7 +127,6 @@ views::View* AccessibilityPanel::GetContentsView() {
 }
 
 bool AccessibilityPanel::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   // Eat all requests as context menus are disallowed.
   return true;

chrome/browser/chromeos/accessibility/accessibility_panel.h

@@ -54,8 +54,7 @@ class AccessibilityPanel : public views::WidgetDelegate,
   class AccessibilityPanelWebContentsObserver;
 
   // content::WebContentsDelegate:
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
 
   // Indirectly invoked by the component extension.
   void DidFirstVisuallyNonEmptyPaint();

chrome/browser/chromeos/first_run/first_run_view.cc

@@ -60,7 +60,6 @@ content::WebContents* FirstRunView::GetWebContents() {
 }
 
 bool FirstRunView::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   // Discards context menu.
   return true;

chrome/browser/chromeos/first_run/first_run_view.h

@@ -38,8 +38,7 @@ class FirstRunView : public views::View,
 
  private:
   // Overriden from content::WebContentsDelegate.
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
   content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override;

chrome/browser/chromeos/hats/hats_dialog.cc

@@ -190,8 +190,7 @@ bool HatsDialog::ShouldShowDialogTitle() const {
   return false;
 }
 
-bool HatsDialog::HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                                   const content::ContextMenuParams& params) {
+bool HatsDialog::HandleContextMenu(const content::ContextMenuParams& params) {
   // Disable context menu.
   return true;
 }

chrome/browser/chromeos/hats/hats_dialog.h

@@ -42,8 +42,7 @@ class HatsDialog : public ui::WebDialogDelegate {
   void OnCloseContents(content::WebContents* source,
                        bool* out_close_dialog) override;
   bool ShouldShowDialogTitle() const override;
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
 
   std::string html_data_;
 

chrome/browser/chromeos/login/ui/login_web_dialog.cc

@@ -146,7 +146,6 @@ bool LoginWebDialog::ShouldShowDialogTitle() const {
 }
 
 bool LoginWebDialog::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   // Disable context menu.
   return true;

chrome/browser/chromeos/login/ui/login_web_dialog.h

@@ -76,8 +76,7 @@ class LoginWebDialog : public ui::WebDialogDelegate {
   void OnCloseContents(content::WebContents* source,
                        bool* out_close_dialog) override;
   bool ShouldShowDialogTitle() const override;
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
   bool HandleOpenURLFromTab(content::WebContents* source,
                             const content::OpenURLParams& params,
                             content::WebContents** out_new_contents) override;

chrome/browser/chromeos/login/ui/oobe_ui_dialog_delegate.cc

@@ -408,7 +408,6 @@ bool OobeUIDialogDelegate::ShouldShowDialogTitle() const {
 }
 
 bool OobeUIDialogDelegate::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   return true;
 }

chrome/browser/chromeos/login/ui/oobe_ui_dialog_delegate.h

@@ -110,8 +110,7 @@ class OobeUIDialogDelegate : public display::DisplayObserver,
   void OnCloseContents(content::WebContents* source,
                        bool* out_close_dialog) override;
   bool ShouldShowDialogTitle() const override;
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
   std::vector<ui::Accelerator> GetAccelerators() override;
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
 

chrome/browser/chromeos/login/ui/webui_login_view.cc

@@ -420,7 +420,6 @@ void WebUILoginView::OnKeyboardVisibilityChanged(bool visible) {
 // WebUILoginView private: -----------------------------------------------------
 
 bool WebUILoginView::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
 #ifndef NDEBUG
   // Do not show the context menu.

chrome/browser/chromeos/login/ui/webui_login_view.h

@@ -149,8 +149,7 @@ class WebUILoginView : public views::View,
   void OnKeyboardVisibilityChanged(bool visible) override;
 
   // Overridden from content::WebContentsDelegate.
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
   bool HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override;

chrome/browser/media/offscreen_tab.cc

@@ -245,9 +245,7 @@ void OffscreenTab::CanDownload(
   callback.Run(false);
 }
 
-bool OffscreenTab::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
-    const content::ContextMenuParams& params) {
+bool OffscreenTab::HandleContextMenu(const content::ContextMenuParams& params) {
   // Context menus should never be shown.  Do nothing, but indicate the context
   // menu was shown so that default implementation in libcontent does not
   // attempt to do so on its own.

chrome/browser/media/offscreen_tab.h

@@ -91,8 +91,7 @@ class OffscreenTab : protected content::WebContentsDelegate,
   void CanDownload(const GURL& url,
                    const std::string& request_method,
                    const base::RepeatingCallback<void(bool)>& callback) final;
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) final;
+  bool HandleContextMenu(const content::ContextMenuParams& params) final;
   content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) final;

chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc

@@ -296,8 +296,7 @@ class CredentialProviderWebDialogDelegate : public ui::WebDialogDelegate {
   void OnCloseContents(content::WebContents* source,
                        bool* out_close_dialog) override {}
 
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override {
+  bool HandleContextMenu(const content::ContextMenuParams& params) override {
     return true;
   }
 

chrome/browser/ui/user_manager.cc

@@ -21,7 +21,6 @@ UserManagerProfileDialog::BaseDialogDelegate::BaseDialogDelegate()
     : guest_web_contents_(nullptr) {}
 
 bool UserManagerProfileDialog::BaseDialogDelegate::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   // Ignores context menu.
   return true;

chrome/browser/ui/user_manager.h

@@ -98,8 +98,7 @@ class UserManagerProfileDialog {
     BaseDialogDelegate();
 
     // content::WebContentsDelegate:
-    bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                           const content::ContextMenuParams& params) override;
+    bool HandleContextMenu(const content::ContextMenuParams& params) override;
 
     // content::WebContentsDelegate:
     void LoadingStateChanged(content::WebContents* source,

chrome/browser/ui/views/profiles/profile_chooser_view.cc

@@ -611,7 +611,6 @@ base::string16 ProfileChooserView::GetAccessibleWindowTitle() const {
 }
 
 bool ProfileChooserView::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   // Suppresses the context menu because some features, such as inspecting
   // elements, are not appropriate in a bubble.

chrome/browser/ui/views/profiles/profile_chooser_view.h

@@ -95,8 +95,7 @@ class ProfileChooserView : public content::WebContentsDelegate,
   base::string16 GetAccessibleWindowTitle() const override;
 
   // content::WebContentsDelegate:
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
 
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;

chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc

@@ -173,7 +173,6 @@ bool SigninViewControllerDelegateViews::HandleKeyboardEvent(
 }
 
 bool SigninViewControllerDelegateViews::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   // Discard the context menu
   return true;

chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h

@@ -53,8 +53,7 @@ class SigninViewControllerDelegateViews
   content::WebContents* GetWebContents() override;
 
   // content::WebContentsDelegate:
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
   bool HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override;

chrome/browser/ui/webui/set_as_default_browser_ui_win.cc

@@ -219,8 +219,7 @@ class SetAsDefaultBrowserDialogImpl : public ui::WebDialogDelegate,
   void OnDialogClosed(const std::string& json_retval) override;
   void OnCloseContents(WebContents* source, bool* out_close_dialog) override;
   bool ShouldShowDialogTitle() const override;
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
 
   // Overridden from ResponseDelegate:
   void SetDialogInteractionResult(MakeChromeDefaultResult result) override;
@@ -348,7 +347,6 @@ bool SetAsDefaultBrowserDialogImpl::ShouldShowDialogTitle() const {
 }
 
 bool SetAsDefaultBrowserDialogImpl::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   return true;
 }

content/browser/site_per_process_hit_test_browsertest.cc

@@ -4983,8 +4983,7 @@ class ContextMenuObserverDelegate : public WebContentsDelegate {
 
   ~ContextMenuObserverDelegate() override {}
 
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override {
+  bool HandleContextMenu(const content::ContextMenuParams& params) override {
     context_menu_created_ = true;
     menu_params_ = params;
     message_loop_runner_->Quit();

content/browser/web_contents/web_contents_impl.cc

@@ -5257,8 +5257,7 @@ void WebContentsImpl::ShowContextMenu(RenderFrameHost* render_frame_host,
 
   ContextMenuParams context_menu_params(params);
   // Allow WebContentsDelegates to handle the context menu operation first.
-  if (delegate_ &&
-      delegate_->HandleContextMenu(render_frame_host, context_menu_params))
+  if (delegate_ && delegate_->HandleContextMenu(context_menu_params))
     return;
 
   render_view_host_delegate_view_->ShowContextMenu(render_frame_host,

content/browser/web_contents/web_contents_impl_unittest.cc

@@ -3364,27 +3364,4 @@ TEST_F(WebContentsImplTest, DidFirstVisuallyNonEmptyPaint) {
   EXPECT_TRUE(observer.observed_did_first_visually_non_empty_paint());
 }
 
-namespace {
-
-class MockWebContentsDelegate : public WebContentsDelegate {
- public:
-  MOCK_METHOD2(HandleContextMenu,
-               bool(RenderFrameHost*, const ContextMenuParams&));
-};
-
-}  // namespace
-
-TEST_F(WebContentsImplTest, HandleContextMenuDelegate) {
-  MockWebContentsDelegate delegate;
-  contents()->SetDelegate(&delegate);
-
-  RenderFrameHost* rfh = main_test_rfh();
-  EXPECT_CALL(delegate, HandleContextMenu(rfh, ::testing::_));
-
-  ContextMenuParams params;
-  contents()->ShowContextMenu(rfh, params);
-
-  contents()->SetDelegate(nullptr);
-}
-
 }  // namespace content

content/browser/web_contents/web_contents_view_android.cc

@@ -310,7 +310,6 @@ void WebContentsViewAndroid::ShowContextMenu(
     RenderFrameHost* render_frame_host, const ContextMenuParams& params) {
   auto* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
       web_contents_->GetRenderWidgetHostView());
-
   // See if context menu is handled by SelectionController as a selection menu.
   // If not, use the delegate to show it.
   if (rwhv && rwhv->ShowSelectionMenu(params))

content/browser/web_contents/web_contents_view_mac.mm

@@ -255,6 +255,12 @@
 void WebContentsViewMac::ShowContextMenu(
     RenderFrameHost* render_frame_host,
     const ContextMenuParams& params) {
+  // Allow delegates to handle the context menu operation first.
+  if (web_contents_->GetDelegate() &&
+      web_contents_->GetDelegate()->HandleContextMenu(params)) {
+    return;
+  }
+
   if (delegate())
     delegate()->ShowContextMenu(render_frame_host, params);
   else

content/public/browser/web_contents_delegate.cc

@@ -83,8 +83,7 @@ void WebContentsDelegate::CanDownload(
   callback.Run(true);
 }
 
-bool WebContentsDelegate::HandleContextMenu(RenderFrameHost* render_frame_host,
-                                            const ContextMenuParams& params) {
+bool WebContentsDelegate::HandleContextMenu(const ContextMenuParams& params) {
   return false;
 }
 

content/public/browser/web_contents_delegate.h

@@ -246,8 +246,7 @@ class CONTENT_EXPORT WebContentsDelegate {
                            const base::Callback<void(bool)>& callback);
 
   // Returns true if the context menu operation was handled by the delegate.
-  virtual bool HandleContextMenu(RenderFrameHost* render_frame_host,
-                                 const ContextMenuParams& params);
+  virtual bool HandleContextMenu(const ContextMenuParams& params);
 
   // Allows delegates to handle keyboard events before sending to the renderer.
   // See enum for description of return values.

extensions/browser/guest_view/app_view/app_view_guest.cc

@@ -117,9 +117,7 @@ AppViewGuest::AppViewGuest(WebContents* owner_web_contents)
 AppViewGuest::~AppViewGuest() {
 }
 
-bool AppViewGuest::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
-    const content::ContextMenuParams& params) {
+bool AppViewGuest::HandleContextMenu(const content::ContextMenuParams& params) {
   if (app_view_guest_delegate_) {
     return app_view_guest_delegate_->HandleContextMenu(web_contents(), params);
   }

extensions/browser/guest_view/app_view/app_view_guest.h

@@ -60,8 +60,7 @@ class AppViewGuest : public guest_view::GuestView<AppViewGuest> {
   int GetTaskPrefix() const final;
 
   // content::WebContentsDelegate implementation.
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) final;
+  bool HandleContextMenu(const content::ContextMenuParams& params) final;
   void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,

extensions/browser/guest_view/extension_options/extension_options_guest.cc

@@ -199,7 +199,6 @@ void ExtensionOptionsGuest::CloseContents(WebContents* source) {
 }
 
 bool ExtensionOptionsGuest::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   if (!extension_options_guest_delegate_)
     return false;

extensions/browser/guest_view/extension_options/extension_options_guest.h

@@ -48,8 +48,7 @@ class ExtensionOptionsGuest
       content::WebContents* source,
       const content::OpenURLParams& params) final;
   void CloseContents(content::WebContents* source) final;
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) final;
+  bool HandleContextMenu(const content::ContextMenuParams& params) final;
   bool ShouldCreateWebContents(
       content::WebContents* web_contents,
       content::RenderFrameHost* opener,

extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc

@@ -286,7 +286,6 @@ void MimeHandlerViewGuest::NavigationStateChanged(
 }
 
 bool MimeHandlerViewGuest::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   return delegate_ && delegate_->HandleContextMenu(web_contents(), params);
 }

extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h

@@ -125,8 +125,7 @@ class MimeHandlerViewGuest
       const content::OpenURLParams& params) final;
   void NavigationStateChanged(content::WebContents* source,
                               content::InvalidateTypes changed_flags) final;
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) final;
+  bool HandleContextMenu(const content::ContextMenuParams& params) final;
   bool PreHandleGestureEvent(content::WebContents* source,
                              const blink::WebGestureEvent& event) final;
   content::JavaScriptDialogManager* GetJavaScriptDialogManager(

extensions/browser/guest_view/web_view/web_view_guest.cc

@@ -605,7 +605,6 @@ ZoomController::ZoomMode WebViewGuest::GetZoomMode() {
 }
 
 bool WebViewGuest::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   return web_view_guest_delegate_ &&
          web_view_guest_delegate_->HandleContextMenu(params);

extensions/browser/guest_view/web_view/web_view_guest.h

@@ -212,8 +212,7 @@ class WebViewGuest : public guest_view::GuestView<WebViewGuest> {
                               int32_t line_no,
                               const base::string16& source_id) final;
   void CloseContents(content::WebContents* source) final;
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) final;
+  bool HandleContextMenu(const content::ContextMenuParams& params) final;
   bool HandleKeyboardEvent(content::WebContents* source,
                            const content::NativeWebKeyboardEvent& event) final;
   void LoadProgressChanged(content::WebContents* source, double progress) final;

ui/views/controls/webview/web_dialog_view.cc

@@ -268,12 +268,10 @@ bool WebDialogView::ShouldShowDialogTitle() const {
 }
 
 bool WebDialogView::HandleContextMenu(
-    content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params) {
   if (delegate_)
-    return delegate_->HandleContextMenu(render_frame_host, params);
-  return WebDialogWebContentsDelegate::HandleContextMenu(render_frame_host,
-                                                         params);
+    return delegate_->HandleContextMenu(params);
+  return WebDialogWebContentsDelegate::HandleContextMenu(params);
 }
 
 ////////////////////////////////////////////////////////////////////////////////