Getting rid of SurfaceIdHandler as it is no longer needed.

ui/aura/mus/window_port_mus.h

 // Copyright 2016 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.
 
 #ifndef UI_AURA_MUS_WINDOW_PORT_MUS_H_
 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 10 matching lines @@
 #include "ui/aura/mus/window_compositor_frame_sink.h"
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/window_port.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/platform_window/mojo/text_input_state.mojom.h"
 
 namespace aura {
 
 class ClientSurfaceEmbedder;
 class PropertyConverter;
-class SurfaceIdHandler;
 class Window;
 class WindowPortMusTestApi;
 class WindowTreeClient;
 class WindowTreeClientPrivate;
 class WindowTreeHostMus;
 
 // WindowPortMus is a WindowPort that forwards calls to WindowTreeClient
 // so that changes are propagated to the server. All changes from
 // WindowTreeClient to the underlying Window route through this class (by
 // way of WindowMus) and are done in such a way that they don't result in
@@ skipping 24 matching lines @@
   std::unique_ptr<WindowCompositorFrameSink> RequestCompositorFrameSink(
       ui::mojom::CompositorFrameSinkType type,
       scoped_refptr<cc::ContextProvider> context_provider,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
 
   void AttachCompositorFrameSink(
       ui::mojom::CompositorFrameSinkType type,
       std::unique_ptr<WindowCompositorFrameSinkBinding>
           compositor_frame_sink_binding);
 
-  void set_surface_id_handler(SurfaceIdHandler* surface_id_handler) {
-    surface_id_handler_ = surface_id_handler;
-  }
-
  private:
   friend class WindowPortMusTestApi;
   friend class WindowTreeClient;
   friend class WindowTreeClientPrivate;
   friend class WindowTreeHostMus;
 
   using ServerChangeIdType = uint8_t;
 
   // Changes to the underlying Window originating from the server must be done
   // in such a way that the same change is not applied back to the server. To
@@ skipping 153 matching lines @@
   WindowTreeClient* window_tree_client_;
 
   Window* window_ = nullptr;
 
   // Used when this window is embedding a client.
   std::unique_ptr<ClientSurfaceEmbedder> client_surface_embedder;
 
   ServerChangeIdType next_server_change_id_ = 0;
   ServerChanges server_changes_;
 
-  SurfaceIdHandler* surface_id_handler_ = nullptr;
   cc::SurfaceInfo surface_info_;
 
   ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL;
 
   DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_PORT_MUS_H_