Handle early ServiceRequest errors in shell::ServiceContext

content/common/mojo/mojo_shell_connection_impl.cc

 // Copyright 2016 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/common/mojo/mojo_shell_connection_impl.h"
 
 #include <queue>
 #include <utility>
 #include <vector>
 
@@ skipping 173 matching lines @@
     }
 
     // Resetting the ServiceContext below may otherwise release the last
     // reference to this IOThreadContext. We keep it alive until the stack
     // unwinds.
     scoped_refptr<IOThreadContext> keepalive(this);
 
     factory_bindings_.CloseAllBindings();
     service_context_.reset();
 
+    ClearConnectionFiltersOnIOThread();
+  }
+
+  void ClearConnectionFiltersOnIOThread() {
     base::AutoLock lock(lock_);
     connection_filters_.clear();
   }
 
   void RemoveConnectionFilterOnIOThread(int filter_id) {
     base::AutoLock lock(lock_);
     auto it = connection_filters_.find(filter_id);
     DCHECK(it != connection_filters_.end());
     connection_filters_.erase(it);
   }
@@ skipping 41 matching lines @@
       registry->SetConnectionLostClosure(
           base::Bind(&IOThreadContext::OnBrowserConnectionLost, this));
       return true;
     }
 
     // If no filters were interested, reject the connection.
     return accept;
   }
 
   bool OnStop() override {
+    ClearConnectionFiltersOnIOThread();
     callback_task_runner_->PostTask(FROM_HERE, stop_callback_);
     return true;
   }
 
   /////////////////////////////////////////////////////////////////////////////
   // shell::InterfaceFactory<shell::mojom::ServiceFactory> implementation
 
   void Create(const shell::Identity& remote_identity,
               shell::mojom::ServiceFactoryRequest request) override {
     DCHECK(io_thread_checker_.CalledOnValidThread());
@@ skipping 225 matching lines @@
 
 void MojoShellConnectionImpl::GetInterface(
     shell::mojom::InterfaceProvider* provider,
     const std::string& interface_name,
     mojo::ScopedMessagePipeHandle request_handle) {
   provider->GetInterface(interface_name, std::move(request_handle));
 }
 
 }  // namespace content