Convert //shell/... to use set_connection_error_handler() instead of set_error_handler().

shell/child_process_host.h

 // Copyright 2014 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.
 
 #ifndef SHELL_CHILD_PROCESS_HOST_H_
 #define SHELL_CHILD_PROCESS_HOST_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process.h"
 #include "mojo/edk/embedder/channel_info_forward.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "shell/child_controller.mojom.h"
 
 namespace shell {
 
 class Context;
 
 // Child process host: parent-process representation of a child process, which
 // hosts/runs a native Mojo application loaded from the file system. This class
 // handles launching and communicating with the child process.
 //
 // This class is not thread-safe. It should be created/used/destroyed on a
 // single thread.
-class ChildProcessHost : public mojo::ErrorHandler {
+class ChildProcessHost {
  public:
   explicit ChildProcessHost(Context* context);
-  ~ChildProcessHost() override;
+  // TODO(vtl): Virtual because |DidStart()| is, even though it shouldn't be
+  // (see |DidStart()|).
+  virtual ~ChildProcessHost();
 
   // |Start()|s the child process; calls |DidStart()| (on the thread on which
   // |Start()| was called) when the child has been started (or failed to start).
   // After calling |Start()|, this object must not be destroyed until
   // |DidStart()| has been called.
   // TODO(vtl): Consider using weak pointers and removing this requirement.
   // TODO(vtl): This should probably take a callback instead.
   // TODO(vtl): Consider merging this with |StartApp()|.
   void Start();
 
@@ skipping 22 matching lines @@
   struct LaunchData;
 
   // Callback for |mojo::embedder::ConnectToSlave()|.
   void DidConnectToSlave();
 
   // Note: This is probably executed on a different thread (namely, using the
   // blocking pool).
   base::Process DoLaunch(scoped_ptr<LaunchData> launch_data);
 
   void AppCompleted(int32_t result);
-
-  // |mojo::ErrorHandler| methods:
-  void OnConnectionError() override;
+  void OnConnectionError();
 
   Context* const context_;
 
   ChildControllerPtr controller_;
   mojo::embedder::ChannelInfo* channel_info_;
   ChildController::StartAppCallback on_app_complete_;
 
   base::Process child_process_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessHost);
 };
 
 }  // namespace shell
 
 #endif  // SHELL_CHILD_PROCESS_HOST_H_