Make cc::SurfaceId unguessable

components/mus/ws/server_window_surface.cc

 // Copyright 2015 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 "components/mus/ws/server_window_surface.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "components/mus/surfaces/surfaces_state.h"
@@ skipping 92 matching lines @@
 }
 
 bool ServerWindowSurface::ConvertSurfaceDrawQuad(
     const mojom::QuadPtr& input,
     const mojom::CompositorFrameMetadataPtr& metadata,
     cc::SharedQuadState* sqs,
     cc::RenderPass* render_pass) {
   // Surface ids originate from the client, meaning they are ClientWindowIds
   // and can only be resolved by the client that submitted the frame.
   const ClientWindowId other_client_window_id(
-      input->surface_quad_state->surface.To<cc::SurfaceId>().id);
+      input->surface_quad_state->surface->local_id);
   ServerWindow* other_window = window()->delegate()->FindWindowForSurface(
       window(), mojom::SurfaceType::DEFAULT, other_client_window_id);
   if (!other_window) {
     DVLOG(2) << "The window ID '" << other_client_window_id.id
              << "' does not exist.";
     // TODO(fsamuel): We return true here so that the CompositorFrame isn't
     // entirely rejected. We just drop this SurfaceDrawQuad. This failure
     // can happen if the client has an out of date view of the window tree.
     // It would be nice if we can avoid reaching this state in the future.
     return true;
@@ skipping 36 matching lines @@
       mojo::Array<mojom::ReturnedResourcePtr>::From(resources));
 }
 
 void ServerWindowSurface::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Implement this.
 }
 
 }  // namespace ws
 }  // namespace mus