Replaced cc::SurfaceId::nonce_ with base::UnguessableToken

content/browser/renderer_host/delegated_frame_host.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 "content/browser/renderer_host/delegated_frame_host.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 198 matching lines @@
 
 cc::FrameSinkId DelegatedFrameHost::GetFrameSinkId() {
   return frame_sink_id_;
 }
 
 cc::SurfaceId DelegatedFrameHost::SurfaceIdAtPoint(
     cc::SurfaceHittestDelegate* delegate,
     const gfx::Point& point,
     gfx::Point* transformed_point) {
   cc::SurfaceId surface_id(frame_sink_id_, local_frame_id_);
-  if (surface_id.is_null())
+  // TODO(staraz): Kludge: The is_null() check is causing tests to fail.
+  // The proper fix is to change it to is_valid which is going to be added in
+  // another CL
+  if (frame_sink_id_.is_null() || local_frame_id_.is_null())
     return surface_id;
   cc::SurfaceHittest hittest(delegate, GetSurfaceManager());
   gfx::Transform target_transform;
   cc::SurfaceId target_local_frame_id =
       hittest.GetTargetSurfaceAtPoint(surface_id, point, &target_transform);
   *transformed_point = point;
   if (!target_local_frame_id.is_null())
     target_transform.TransformPoint(transformed_point);
   return target_local_frame_id;
 }
@@ skipping 653 matching lines @@
         std::move(request));
   }
 }
 
 void DelegatedFrameHost::UnlockResources() {
   DCHECK(!local_frame_id_.is_null());
   delegated_frame_evictor_->UnlockFrame();
 }
 
 }  // namespace content