Revert of Move content's shell connections to the IO thread

services/shell/public/cpp/lib/interface_registry.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 "services/shell/public/cpp/interface_registry.h"
 
 #include "services/shell/public/cpp/connection.h"
 
 namespace shell {
 
@@ skipping 21 matching lines @@
       name);
 }
 
 void InterfaceRegistry::RemoveInterface(const std::string& name) {
   auto it = name_to_binder_.find(name);
   if (it != name_to_binder_.end())
     name_to_binder_.erase(it);
 }
 
 void InterfaceRegistry::PauseBinding() {
-  DCHECK(!is_paused_);
-  is_paused_ = true;
+  DCHECK(!pending_request_.is_pending());
+  DCHECK(binding_.is_bound());
+  pending_request_ = binding_.Unbind();
 }
 
 void InterfaceRegistry::ResumeBinding() {
-  DCHECK(is_paused_);
-  is_paused_ = false;
-
-  while (!pending_interface_requests_.empty()) {
-    auto& request = pending_interface_requests_.front();
-    GetInterface(request.first, std::move(request.second));
-    pending_interface_requests_.pop();
-  }
+  DCHECK(pending_request_.is_pending());
+  DCHECK(!binding_.is_bound());
+  binding_.Bind(std::move(pending_request_));
 }
 
 // mojom::InterfaceProvider:
 void InterfaceRegistry::GetInterface(const mojo::String& interface_name,
                                      mojo::ScopedMessagePipeHandle handle) {
-  if (is_paused_) {
-    pending_interface_requests_.emplace(interface_name, std::move(handle));
-    return;
-  }
-
   auto iter = name_to_binder_.find(interface_name);
   if (iter != name_to_binder_.end()) {
     iter->second->BindInterface(connection_, interface_name, std::move(handle));
   } else if (connection_ && !connection_->AllowsInterface(interface_name)) {
     LOG(ERROR) << "Connection CapabilityFilter prevented binding to "
                << "interface: " << interface_name << " connection_name:"
                << connection_->GetConnectionName() << " remote_name:"
                << connection_->GetRemoteIdentity().name();
-  } else if (!default_binder_.is_null()) {
-    default_binder_.Run(interface_name, std::move(handle));
   }
 }
 
 bool InterfaceRegistry::SetInterfaceBinderForName(
     std::unique_ptr<InterfaceBinder> binder,
     const std::string& interface_name) {
   if (!connection_ ||
       (connection_ && connection_->AllowsInterface(interface_name))) {
     RemoveInterface(interface_name);
     name_to_binder_[interface_name] = std::move(binder);
     return true;
   }
   return false;
 }
 
 }  // namespace shell