Privatize StrongBinding lifetime management

content/renderer/image_downloader/image_downloader_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_IMAGE_DOWNLOADER_IMAGE_DOWNLOADER_IMPL_H_
 #define CONTENT_RENDERER_IMAGE_DOWNLOADER_IMAGE_DOWNLOADER_IMPL_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "content/common/image_downloader/image_downloader.mojom.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_thread_observer.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/binding.h"
 #include "url/gurl.h"
 
 class SkBitmap;
 
 namespace gfx {
 class Size;
 }
 
 namespace content {
 
 class MultiResolutionImageResourceFetcher;
 class RenderFrame;
 
-class ImageDownloaderImpl : public content::mojom::ImageDownloader,
+class ImageDownloaderImpl : public mojom::ImageDownloader,
                             public RenderFrameObserver,
                             public RenderThreadObserver {
  public:
-  static void CreateMojoService(
-      RenderFrame* render_frame,
-      mojo::InterfaceRequest<content::mojom::ImageDownloader> request);
+  ~ImageDownloaderImpl() override;
+
+  static void CreateMojoService(RenderFrame* render_frame,
+                                mojom::ImageDownloaderRequest request);
 
   // RenderThreadObserver implementation.
   void OnRenderProcessShutdown() override;
 
  private:
-  ImageDownloaderImpl(
-      RenderFrame* render_frame,
-      mojo::InterfaceRequest<content::mojom::ImageDownloader> request);
-  ~ImageDownloaderImpl() override;
+  ImageDownloaderImpl(RenderFrame* render_frame,
+                      mojom::ImageDownloaderRequest request);
 
   // RenderFrameObserver implementation.
   void OnDestruct() override;
 
   // ImageDownloader methods:
   void DownloadImage(const GURL& url,
                      bool is_favicon,
                      uint32_t max_bitmap_size,
                      bool bypass_cache,
                      const DownloadImageCallback& callback) override;
@@ skipping 21 matching lines @@
                      MultiResolutionImageResourceFetcher* fetcher,
                      const std::vector<SkBitmap>& images);
 
   // Reply download result
   void ReplyDownloadResult(
       int32_t http_status_code,
       const std::vector<SkBitmap>& result_images,
       const std::vector<gfx::Size>& result_original_image_sizes,
       const DownloadImageCallback& callback);
 
-  // We use StrongBinding to ensure deletion of "this" when connection closed
-  mojo::StrongBinding<ImageDownloader> binding_;
-
   typedef ScopedVector<MultiResolutionImageResourceFetcher>
       ImageResourceFetcherList;
 
   // ImageResourceFetchers schedule via FetchImage.
   ImageResourceFetcherList image_fetchers_;
 
+  mojo::Binding<mojom::ImageDownloader> binding_;
+
   DISALLOW_COPY_AND_ASSIGN(ImageDownloaderImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_IMAGE_DOWNLOADER_IMAGE_DOWNLOADER_IMPL_H_