Send hardware video frames with mailboxes.

cc/resources/video_resource_updater.h

Index: cc/resources/video_resource_updater.h
diff --git a/cc/resources/video_resource_updater.h b/cc/resources/video_resource_updater.h
index 6e5c27d2f6ea5ae70db55ca39b367e4df43dd1eb..68d7cfdeabe121f5df4b5ff85f2ad881ca77bec0 100644
--- a/cc/resources/video_resource_updater.h
+++ b/cc/resources/video_resource_updater.h
@@ -47,10 +47,6 @@ class VideoFrameExternalResources {
   ResourceType type;
   std::vector<TextureMailbox> mailboxes;
 
-  // TODO(danakj): Remove these when we get a Mailbox from VideoFrame.
-  unsigned hardware_resource;
-  TextureMailbox::ReleaseCallback hardware_release_callback;
-
   // TODO(danakj): Remove these too.
   std::vector<unsigned> software_resources;
   TextureMailbox::ReleaseCallback software_release_callback;
@@ -67,10 +63,7 @@ class VideoResourceUpdater
   explicit VideoResourceUpdater(ResourceProvider* resource_provider);
   ~VideoResourceUpdater();
 
-  VideoFrameExternalResources CreateForHardwarePlanes(
-      const scoped_refptr<media::VideoFrame>& video_frame);
-
-  VideoFrameExternalResources CreateForSoftwarePlanes(
+  VideoFrameExternalResources CreateExternalResourcesFromVideoFrame(
       const scoped_refptr<media::VideoFrame>& video_frame);
 
  private:
@@ -92,6 +85,10 @@ class VideoResourceUpdater
 
   void DeleteResource(unsigned resource_id);
   bool VerifyFrame(const scoped_refptr<media::VideoFrame>& video_frame);
+  VideoFrameExternalResources CreateForHardwarePlanes(
+      const scoped_refptr<media::VideoFrame>& video_frame);
+  VideoFrameExternalResources CreateForSoftwarePlanes(
+      const scoped_refptr<media::VideoFrame>& video_frame);
 
   struct RecycleResourceData {
     unsigned resource_id;
@@ -103,10 +100,6 @@ class VideoResourceUpdater
                               RecycleResourceData data,
                               unsigned sync_point,
                               bool lost_resource);
-  static void ReturnTexture(base::WeakPtr<VideoResourceUpdater> updater,
-                            unsigned resource_id,
-                            unsigned sync_point,
-                            bool lost_resource);
 
   ResourceProvider* resource_provider_;
   scoped_ptr<media::SkCanvasVideoRenderer> video_renderer_;