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

cc/surfaces/surface.cc

 // Copyright 2014 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 "cc/surfaces/surface.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 68 matching lines @@
   QueueFrame(CompositorFrame(), DrawCallback());
   current_frame_.reset();
 }
 
 void Surface::RequestCopyOfOutput(
     std::unique_ptr<CopyOutputRequest> copy_request) {
   if (current_frame_ && !current_frame_->render_pass_list.empty()) {
     std::vector<std::unique_ptr<CopyOutputRequest>>& copy_requests =
         current_frame_->render_pass_list.back()->copy_requests;
 
-    if (void* source = copy_request->source()) {
+    if (copy_request->has_source()) {
+      const base::UnguessableToken& source = copy_request->source();
       // Remove existing CopyOutputRequests made on the Surface by the same
       // source.
       auto to_remove =
           std::remove_if(copy_requests.begin(), copy_requests.end(),
                          [source](const std::unique_ptr<CopyOutputRequest>& x) {

[vmpstr, 2017/01/27 19:41:25]

nit: capture by reference

[Saman Sami, 2017/01/27 20:03:20]

Done.

-                           return x->source() == source;
+                           return x->has_source() && x->source() == source;
                          });
       copy_requests.erase(to_remove, copy_requests.end());
     }
     copy_requests.push_back(std::move(copy_request));
   } else {
     copy_request->SendEmptyResult();
   }
 }
 
 void Surface::TakeCopyOutputRequests(
@@ skipping 65 matching lines @@
 void Surface::ClearCopyRequests() {
   if (current_frame_) {
     for (const auto& render_pass : current_frame_->render_pass_list) {
       for (const auto& copy_request : render_pass->copy_requests)
         copy_request->SendEmptyResult();
     }
   }
 }
 
 }  // namespace cc