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

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <tuple>
@@ skipping 251 matching lines @@
   void OnSurfaceCreated(const cc::SurfaceInfo& surface_info) override {}
 
   void OnSurfaceDamaged(const cc::SurfaceId& id, bool* changed) override {
     *changed = true;
   }
 };
 
 class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber {
  public:
   FakeFrameSubscriber(gfx::Size size, base::Callback<void(bool)> callback)
-      : size_(size), callback_(callback), should_capture_(true) {}
+      : size_(size),
+        callback_(callback),
+        should_capture_(true),
+        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 {
     if (!should_capture_)
       return false;
     last_present_time_ = present_time;
     *storage = media::VideoFrame::CreateFrame(media::PIXEL_FORMAT_YV12, size_,
                                               gfx::Rect(size_), size_,
                                               base::TimeDelta());
     *callback = base::Bind(&FakeFrameSubscriber::CallbackMethod, callback_);
     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_;
+  }
+
   base::TimeTicks last_present_time() const { return last_present_time_; }
 
   void set_should_capture(bool should_capture) {
     should_capture_ = should_capture;
   }
 
   static void CallbackMethod(base::Callback<void(bool)> callback,
                              base::TimeTicks present_time,
                              const gfx::Rect& region_in_frame,
                              bool success) {
     callback.Run(success);
   }
 
  private:
   gfx::Size size_;
   base::Callback<void(bool)> callback_;
   base::TimeTicks last_present_time_;
   bool should_capture_;
+  base::UnguessableToken source_id_for_copy_request_;
 };
 
 class FakeWindowEventDispatcher : public aura::WindowEventDispatcher {
  public:
   FakeWindowEventDispatcher(aura::WindowTreeHost* host)
       : WindowEventDispatcher(host),
         processed_touch_event_count_(0) {}
 
   void ProcessedTouchEvent(uint32_t unique_event_id,
                            aura::Window* window,
@@ skipping 4443 matching lines @@
     // There is no composition in the beginning.
     EXPECT_FALSE(has_composition_text());
     SetHasCompositionTextToTrue();
     view->ImeCancelComposition();
     // The composition must have been canceled.
     EXPECT_FALSE(has_composition_text());
   }
 }
 
 }  // namespace content