Privatize StrongBinding lifetime management

content/renderer/image_downloader/image_downloader_impl.cc

 // Copyright 2015 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/renderer/image_downloader/image_downloader_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 105 matching lines @@
   original_image_sizes->push_back(
       gfx::Size(min_image->width(), min_image->height()));
 }
 
 }  // namespace
 
 namespace content {
 
 ImageDownloaderImpl::ImageDownloaderImpl(
     RenderFrame* render_frame,
-    mojo::InterfaceRequest<content::mojom::ImageDownloader> request)
-    : RenderFrameObserver(render_frame), binding_(this, std::move(request)) {
+    mojom::ImageDownloaderRequest request)
+    : RenderFrameObserver(render_frame),
+      binding_(this, std::move(request)) {
   DCHECK(render_frame);
   RenderThread::Get()->AddObserver(this);
+  binding_.set_connection_error_handler(
+      base::Bind(&ImageDownloaderImpl::OnDestruct, base::Unretained(this)));
 }
 
 ImageDownloaderImpl::~ImageDownloaderImpl() {
   RenderThread* thread = RenderThread::Get();
   // As ImageDownloaderImpl is a strong binding with message pipe, the
   // destructor may run after message loop shutdown, so we need to check whether
   // RenderThread is null.
   if (thread)
     thread->RemoveObserver(this);
 }
 
 // static
 void ImageDownloaderImpl::CreateMojoService(
     RenderFrame* render_frame,
-    mojo::InterfaceRequest<content::mojom::ImageDownloader> request) {
-  DVLOG(1) << "ImageDownloaderImpl::CreateService";
+    mojom::ImageDownloaderRequest request) {
+  DVLOG(1) << "ImageDownloaderImpl::CreateMojoService";
   DCHECK(render_frame);
 
+  // Owns itself.
   new ImageDownloaderImpl(render_frame, std::move(request));
 }
 
 // Ensure all loaders cleared before calling blink::shutdown.
 void ImageDownloaderImpl::OnRenderProcessShutdown() {
   image_fetchers_.clear();
 }
 
 // ImageDownloader methods:
 void ImageDownloaderImpl::DownloadImage(const GURL& image_url,
@@ skipping 72 matching lines @@
     const std::vector<gfx::Size>& result_original_image_sizes,
     const DownloadImageCallback& callback) {
   callback.Run(http_status_code, result_images, result_original_image_sizes);
 }
 
 void ImageDownloaderImpl::OnDestruct() {
   delete this;
 }
 
 }  // namespace content