Media Remoting: Remove old interstitial implementation.

media/remoting/renderer_controller.h

Index: media/remoting/renderer_controller.h
diff --git a/media/remoting/renderer_controller.h b/media/remoting/renderer_controller.h
index bc7d6e39879b9f48da557e934255b9d262e4fe5a..024aa3f7ccb15ebd0658f472fc03070a7a6f1b7e 100644
--- a/media/remoting/renderer_controller.h
+++ b/media/remoting/renderer_controller.h
@@ -9,7 +9,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "media/base/media_observer.h"
-#include "media/remoting/interstitial.h"
 #include "media/remoting/metrics.h"
 #include "media/remoting/shared_session.h"
 #include "third_party/skia/include/core/SkBitmap.h"

[miu, 2017/04/13 02:15:10]

Can we remove the SkBitmap #include?

[xjz, 2017/04/13 23:48:36]

Yes. Done.

@@ -43,20 +42,9 @@ class RendererController final : public SharedSession::Client,
   void OnRemotePlaybackDisabled(bool disabled) override;
   void OnPlaying() override;
   void OnPaused() override;
-  void OnSetPoster(const GURL& poster) override;
+  void OnSetPoster(const GURL& poster) override {}

[miu, 2017/04/13 02:15:10]

We should remove OnSetPoster() from the interface, and the calls to it from
WMPI. Unless something else is using it?

[xjz, 2017/04/13 23:48:36]

Done.

   void SetClient(MediaObserverClient* client) override;
 
-  using ShowInterstitialCallback = base::Callback<
-      void(const SkBitmap&, const gfx::Size&, InterstitialType type)>;
-  // Called by the CourierRenderer constructor to set the callback to draw and
-  // show remoting interstial.
-  void SetShowInterstitialCallback(const ShowInterstitialCallback& cb);
-  using DownloadPosterCallback =
-      base::Callback<void(const GURL&,
-                          const base::Callback<void(const SkBitmap&)>&)>;
-  // Set the callback to download poster image.
-  void SetDownloadPosterCallback(const DownloadPosterCallback& cb);
-
   base::WeakPtr<RendererController> GetWeakPtr() {
     return weak_factory_.GetWeakPtr();
   }
@@ -113,29 +101,6 @@ class RendererController final : public SharedSession::Client,
   void UpdateAndMaybeSwitch(StartTrigger start_trigger,
                             StopTrigger stop_trigger);
 
-  // Called to download the poster image. Called when:
-  // 1. Poster URL changes.
-  // 2. ShowInterstitialCallback is set.
-  // 3. DownloadPosterCallback is set.
-  void DownloadPosterImage();
-
-  // Called when poster image is downloaded.
-  void OnPosterImageDownloaded(const GURL& download_url,
-                               base::TimeTicks download_start_time,
-                               const SkBitmap& image);
-
-  // Update remoting interstitial with |image|. When |image| is not set,
-  // interstitial will be drawn on previously downloaded poster image (in
-  // CourierRenderer) or black background if none was downloaded before.
-  // Call this when:
-  // 1. SetShowInterstitialCallback() is called (CourierRenderer is created).
-  // 2. The remoting session is shut down (to update the status message in the
-  //    interstitial).
-  // 3. The size of the canvas is changed (to update the background image and
-  //    the position of the status message).
-  // 4. Poster image is downloaded (to update the background image).
-  void UpdateInterstitial(const base::Optional<SkBitmap>& image);
-
   // Indicates whether this media element is in full screen.
   bool is_fullscreen_ = false;
 
@@ -180,27 +145,6 @@ class RendererController final : public SharedSession::Client,
   // Current pipeline metadata.
   PipelineMetadata pipeline_metadata_;
 
-  // The callback to show the remoting interstitial. It is set shortly after
-  // remoting is started (when CourierRenderer is constructed, it calls
-  // SetShowInterstitialCallback()), and is reset shortly after remoting has
-  // ended.
-  ShowInterstitialCallback show_interstitial_cb_;
-
-  // The arguments passed in the last call to the interstitial callback. On each
-  // call to UpdateInterstitial(), one or more of these may be changed. If any
-  // change, the callback will be run.
-  SkBitmap interstitial_background_;
-  gfx::Size interstitial_natural_size_;
-  InterstitialType interstitial_type_ = InterstitialType::BETWEEN_SESSIONS;
-
-  // Current poster URL, whose image will feed into the local UI.
-  GURL poster_url_;
-
-  // The callback to download the poster image. Called when |poster_url_|
-  // changes during a remoting session or the show interstial callback is set.
-  // OnPosterImageDownloaded() will be called when download completes.
-  DownloadPosterCallback download_poster_cb_;
-
   // Records session events of interest.
   SessionMetricsRecorder metrics_recorder_;