Enable find-in-page across GuestViews.

content/browser/browser_plugin/browser_plugin_guest.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 "content/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 130 matching lines @@
   // |guest_proxy_routing_id_| and perform any necessary cleanup on Detach
   // to enable this.
   //
   // TODO(ekaramad): If the guest is embedded inside a cross-process <iframe>
   // (e.g., <embed>-ed PDF), the reverse proxy will not be created and the
   // posted message's source attribute will be null which in turn breaks the
   // two-way messaging between the guest and the embedder. We should either
   // create a RenderFrameProxyHost for the reverse path, or implement
   // MimeHandlerViewGuest using OOPIF (https://crbug.com/659750).
   SiteInstance* owner_site_instance = delegate_->GetOwnerSiteInstance();
+  if (!owner_site_instance)
+    return MSG_ROUTING_NONE;
   int proxy_routing_id = GetWebContents()
                              ->GetFrameTree()
                              ->root()
                              ->render_manager()
                              ->CreateRenderFrameProxy(owner_site_instance);
   guest_proxy_routing_id_ = RenderFrameProxyHost::FromID(
       owner_site_instance->GetProcess()->GetID(), proxy_routing_id)
           ->GetRenderViewHost()->GetRoutingID();
 
   return guest_proxy_routing_id_;
@@ skipping 11 matching lines @@
     last_seen_view_size_ = new_size;
   }
 }
 
 void BrowserPluginGuest::SizeContents(const gfx::Size& new_size) {
   GetWebContents()->GetView()->SizeContents(new_size);
 }
 
 void BrowserPluginGuest::WillDestroy() {
   is_in_destruction_ = true;
+
+  // It is important that the WebContents is notified of destruction before
+  // detaching.
+  GetWebContents()->BrowserPluginGuestWillDestroy();
+
+  attached_ = false;
   owner_web_contents_ = nullptr;
-  attached_ = false;
 }
 
 RenderWidgetHostImpl* BrowserPluginGuest::GetOwnerRenderWidgetHost() const {
   return static_cast<RenderWidgetHostImpl*>(
       delegate_->GetOwnerRenderWidgetHost());
 }
 
 void BrowserPluginGuest::Init() {
   if (initialized_)
     return;
@@ skipping 231 matching lines @@
   GetSurfaceManager()->SatisfySequence(sequence);
 }
 
 void BrowserPluginGuest::OnRequireSequence(
     int instance_id,
     const cc::SurfaceId& id,
     const cc::SurfaceSequence& sequence) {
   GetSurfaceManager()->RequireSequence(id, sequence);
 }
 
-bool BrowserPluginGuest::HandleFindForEmbedder(
-    int request_id,
-    const base::string16& search_text,
-    const blink::WebFindOptions& options) {
-  return delegate_->HandleFindForEmbedder(request_id, search_text, options);
-}
-
-bool BrowserPluginGuest::HandleStopFindingForEmbedder(StopFindAction action) {
-  return delegate_->HandleStopFindingForEmbedder(action);
-}
-
 void BrowserPluginGuest::ResendEventToEmbedder(
     const blink::WebInputEvent& event) {
   if (!attached() || !owner_web_contents_)
     return;
 
   DCHECK(browser_plugin_instance_id_);
   RenderWidgetHostViewBase* view =
       static_cast<RenderWidgetHostViewBase*>(GetOwnerRenderWidgetHostView());
 
   gfx::Vector2d offset_from_embedder = guest_window_rect_.OffsetFromOrigin();
@@ skipping 605 matching lines @@
           range, character_bounds);
 }
 #endif
 
 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) {
   if (delegate_)
     delegate_->SetContextMenuPosition(position);
 }
 
 }  // namespace content