Always set the error handler closure of Binding<> after binding to a …

…message pipe.

This change only modifies users of Binding<>, and not the bindings code
itself.  The intention is to bring the behaviour of Binding<> closer to
that of InterfacePtr<>, which already has this restriction.

BUG=569694

Review URL: https://codereview.chromium.org/1525033004

Cr-Commit-Position: refs/heads/master@{#365710}

content/common/mojo/service_registry_impl.cc

@@ -9,11 +9,7 @@
 namespace content {
 
 ServiceRegistryImpl::ServiceRegistryImpl()
-    : binding_(this), weak_factory_(this) {
-  binding_.set_connection_error_handler(
-      base::Bind(&ServiceRegistryImpl::OnConnectionError,
-                 base::Unretained(this)));
-}
+    : binding_(this), weak_factory_(this) {}
 
 ServiceRegistryImpl::~ServiceRegistryImpl() {
   while (!pending_connects_.empty()) {
@@ -25,6 +21,8 @@ ServiceRegistryImpl::~ServiceRegistryImpl() {
 void ServiceRegistryImpl::Bind(
     mojo::InterfaceRequest<mojo::ServiceProvider> request) {
   binding_.Bind(request.Pass());
+  binding_.set_connection_error_handler(base::Bind(
+      &ServiceRegistryImpl::OnConnectionError, base::Unretained(this)));
 }
 
 void ServiceRegistryImpl::BindRemoteServiceProvider(

mojo/runner/child/runner_connection.cc

@@ -151,7 +151,10 @@ class ChildControllerImpl : public ChildController {
     connection->set_controller(impl.Pass());
   }
 
-  void Bind(ScopedMessagePipeHandle handle) { binding_.Bind(handle.Pass()); }
+  void Bind(ScopedMessagePipeHandle handle) {
+    binding_.Bind(handle.Pass());
+    binding_.set_connection_error_handler([this]() { OnConnectionError(); });
+  }
 
   void OnConnectionError() {
     // A connection error means the connection to the shell is lost. This is not
@@ -184,9 +187,7 @@ class ChildControllerImpl : public ChildController {
         callback_(callback),
         unblocker_(unblocker),
         channel_info_(nullptr),
-        binding_(this) {
-    binding_.set_connection_error_handler([this]() { OnConnectionError(); });
-  }
+        binding_(this) {}
 
   static void ReturnApplicationRequestOnMainThread(
       const GotApplicationRequestCallback& callback,

mojo/runner/host/child_process.cc

@@ -218,7 +218,10 @@ class ChildControllerImpl : public ChildController {
     app_context->set_controller(impl.Pass());
   }
 
-  void Bind(ScopedMessagePipeHandle handle) { binding_.Bind(handle.Pass()); }
+  void Bind(ScopedMessagePipeHandle handle) {
+    binding_.Bind(handle.Pass());
+    binding_.set_connection_error_handler([this]() { OnConnectionError(); });
+  }
 
   void OnConnectionError() {
     // A connection error means the connection to the shell is lost. This is not
@@ -251,9 +254,7 @@ class ChildControllerImpl : public ChildController {
         app_library_(app_library),
         unblocker_(unblocker),
         channel_info_(nullptr),
-        binding_(this) {
-    binding_.set_connection_error_handler([this]() { OnConnectionError(); });
-  }
+        binding_(this) {}
 
   static void StartAppOnMainThread(
       base::NativeLibrary app_library,

mojo/shell/application_instance.cc

@@ -31,7 +31,6 @@ ApplicationInstance::ApplicationInstance(
       queue_requests_(false),
       native_runner_(nullptr),
       pid_(base::kNullProcessId) {
-  binding_.set_connection_error_handler([this]() { OnConnectionError(); });
 }
 
 ApplicationInstance::~ApplicationInstance() {
@@ -43,6 +42,7 @@ ApplicationInstance::~ApplicationInstance() {
 void ApplicationInstance::InitializeApplication() {
   ShellPtr shell;
   binding_.Bind(GetProxy(&shell));
+  binding_.set_connection_error_handler([this]() { OnConnectionError(); });
   application_->Initialize(shell.Pass(), identity_.url().spec());
 }
 

net/proxy/proxy_resolver_factory_mojo.cc

@@ -196,11 +196,10 @@ ProxyResolverMojo::Job::Job(ProxyResolverMojo* resolver,
       results_(results),
       callback_(callback),
       binding_(this) {
-  binding_.set_connection_error_handler(base::Bind(
-      &ProxyResolverMojo::Job::OnConnectionError, base::Unretained(this)));
-
   interfaces::ProxyResolverRequestClientPtr client_ptr;
   binding_.Bind(mojo::GetProxy(&client_ptr));
+  binding_.set_connection_error_handler(base::Bind(
+      &ProxyResolverMojo::Job::OnConnectionError, base::Unretained(this)));
   resolver_->mojo_proxy_resolver_ptr_->GetProxyForUrl(mojo::String::From(url_),
                                                       client_ptr.Pass());
 }