Replace source pointer in cc::CopyOutputRequest with a base::UnguessableToken

content/browser/renderer_host/render_widget_host_view_browsertest.cc

 // Copyright (c) 2013 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 <stdint.h>
 #include <utility>
 
 #include "base/barrier_closure.h"
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 232 matching lines @@
 
  private:
   const CompositingMode compositing_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositingRenderWidgetHostViewBrowserTest);
 };
 
 class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber {
  public:
   FakeFrameSubscriber(
-    RenderWidgetHostViewFrameSubscriber::DeliverFrameCallback callback)
-      : callback_(callback) {
-  }
+      RenderWidgetHostViewFrameSubscriber::DeliverFrameCallback callback)
+      : callback_(callback),
+        source_id_for_copy_request_(base::UnguessableToken::Create()) {}
 
   bool ShouldCaptureFrame(const gfx::Rect& damage_rect,
                           base::TimeTicks present_time,
                           scoped_refptr<media::VideoFrame>* storage,
                           DeliverFrameCallback* callback) override {
     // Only allow one frame capture to be made.  Otherwise, the compositor could
     // start multiple captures, unbounded, and eventually its own limiter logic
     // will begin invoking |callback| with a |false| result.  This flakes out
     // the unit tests, since they receive a "failed" callback before the later
     // "success" callbacks.
     if (callback_.is_null())
       return false;
     *storage = media::VideoFrame::CreateBlackFrame(gfx::Size(100, 100));
     *callback = callback_;
     callback_.Reset();
     return true;
   }
 
+  base::UnguessableToken GetSourceIdForCopyRequest() override {

[Fady Samuel, 2017/01/26 21:22:42]

const base::UnguessableToken&

[Saman Sami, 2017/01/26 21:47:27]

Done.

+    return source_id_for_copy_request_;
+  }
+
  private:
   DeliverFrameCallback callback_;
+  base::UnguessableToken source_id_for_copy_request_;
 };
 
 // Disable tests for Android as it has an incomplete implementation.
 #if !defined(OS_ANDROID)
 
 // The CopyFromBackingStore() API should work on all platforms when compositing
 // is enabled.
 IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTest,
                        CopyFromBackingStore) {
   RunBasicCopyFromBackingStoreTest();
@@ skipping 659 matching lines @@
                         kTestCompositingModes);
 INSTANTIATE_TEST_CASE_P(
     GLAndSoftwareCompositing,
     CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI,
     kTestCompositingModes);
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace
 }  // namespace content