SearchIPCRouter: Invalidate cached connection ID on renderer crash

chrome/browser/ui/search/search_ipc_router.cc

 // Copyright 2013 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/search/search_ipc_router.h"
 
 #include <utility>
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
@@ skipping 23 matching lines @@
  public:
   // The |web_contents| must outlive this object.
   explicit SearchBoxClientFactoryImpl(content::WebContents* web_contents)
       : web_contents_(web_contents),
         last_connected_rfh_(
             std::make_pair(content::ChildProcessHost::kInvalidUniqueID,
                            MSG_ROUTING_NONE)) {}
   chrome::mojom::SearchBox* GetSearchBox() override;
 
  private:
+  void OnConnectionError();
+
   content::WebContents* web_contents_;
   chrome::mojom::SearchBoxAssociatedPtr search_box_;
 
   // The proccess ID and routing ID of the last connected main frame. May be
   // (ChildProcessHost::kInvalidUniqueID, MSG_ROUTING_NONE) if we haven't
   // connected yet.
   std::pair<int, int> last_connected_rfh_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBoxClientFactoryImpl);
 };
 
 chrome::mojom::SearchBox* SearchBoxClientFactoryImpl::GetSearchBox() {
   content::RenderFrameHost* frame = web_contents_->GetMainFrame();
   auto id = std::make_pair(frame->GetProcess()->GetID(), frame->GetRoutingID());
   // Avoid reconnecting repeatedly to the same RenderFrameHost for performance
   // reasons.
   if (id != last_connected_rfh_) {
     if (IsRenderedInInstantProcess(web_contents_)) {
       frame->GetRemoteAssociatedInterfaces()->GetInterface(&search_box_);
+      search_box_.set_connection_error_handler(
+          base::Bind(&SearchBoxClientFactoryImpl::OnConnectionError,
+                     base::Unretained(this)));
     } else {
       // Renderer is not an instant process. We'll create a connection that
       // drops all messages.
       mojo::GetIsolatedProxy(&search_box_);
     }
     last_connected_rfh_ = id;
   }
   return search_box_.get();
 }
 
+void SearchBoxClientFactoryImpl::OnConnectionError() {
+  search_box_.reset();
+  last_connected_rfh_ = std::make_pair(
+      content::ChildProcessHost::kInvalidUniqueID,
+      MSG_ROUTING_NONE);
+}
+
 }  // namespace
 
 SearchIPCRouter::SearchIPCRouter(content::WebContents* web_contents,
                                  Delegate* delegate,
                                  std::unique_ptr<Policy> policy)
     : WebContentsObserver(web_contents),
       delegate_(delegate),
       policy_(std::move(policy)),
       commit_counter_(0),
       is_active_tab_(false),
@@ skipping 242 matching lines @@
 
 void SearchIPCRouter::set_delegate_for_testing(Delegate* delegate) {
   DCHECK(delegate);
   delegate_ = delegate;
 }
 
 void SearchIPCRouter::set_policy_for_testing(std::unique_ptr<Policy> policy) {
   DCHECK(policy);
   policy_ = std::move(policy);
 }