Revert of De-dupe copy requests for tab capture in DelegatedFrameHost.

content/browser/compositor/delegated_frame_host.h

Index: content/browser/compositor/delegated_frame_host.h
diff --git a/content/browser/compositor/delegated_frame_host.h b/content/browser/compositor/delegated_frame_host.h
index a3b43855b503ebd63b804d4971e6ec1b8085ed4b..42ad05d6524ebcf8e9d1105324d593bc0d341c2d 100644
--- a/content/browser/compositor/delegated_frame_host.h
+++ b/content/browser/compositor/delegated_frame_host.h
@@ -136,8 +136,6 @@
                            SkippedDelegatedFrames);
   FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
                            DiscardDelegatedFramesWithLocking);
-  FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraCopyRequestTest,
-                           DedupeFrameSubscriberRequests);
   FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraCopyRequestTest,
                            DestroyedAfterCopyRequest);
 
@@ -230,13 +228,7 @@
   // cc::SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
 
-  // Called to consult the current |frame_subscriber_|, to determine and maybe
-  // initiate a copy-into-video-frame request.
   void DidReceiveFrameFromRenderer(const gfx::Rect& damage_rect);
-
-  // Called when the next copy has completed for the |frame_subscriber_|, to run
-  // the next callback in the |frame_subscriber_callbacks_| queue.
-  void DeliverResultForFrameSubscriber(bool success);
 
   DelegatedFrameHostClient* const client_;
   ui::Compositor* compositor_;
@@ -316,17 +308,6 @@
   scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
   std::vector<scoped_refptr<OwnedMailbox> > idle_frame_subscriber_textures_;
 
-  // Set to true if a frame was received from the renderer and a copy request
-  // was made for the frame subscriber, but drawing has not yet started.  This
-  // is used to prevent more than one copy request being executed per draw.
-  bool frame_subscriber_copy_request_pending_;
-
-  // Stores the delivery callbacks, in order, that will be executed as each of
-  // the frame subscriber's copy-into-video-frame requests completes.  The size
-  // of this queue is always equal to the number of oustanding, de-duped copy
-  // requests.
-  std::deque<base::Callback<void(bool)>> frame_subscriber_callbacks_;
-
   // Callback used to pass the output request to the layer or to a function
   // specified by a test.
   base::Callback<void(scoped_ptr<cc::CopyOutputRequest>)>