Revert of Mus+Ash: propagate Surface ID to parents

services/ui/public/cpp/window_private.h

 // 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.
 
 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_PRIVATE_H_
 #define SERVICES_UI_PUBLIC_CPP_WINDOW_PRIVATE_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/array.h"
-#include "services/ui/public/cpp/surface_id_handler.h"
 #include "services/ui/public/cpp/window.h"
 
 namespace ui {
 
 // This class is a friend of a Window and contains functions to mutate internal
 // state of Window.
 class WindowPrivate {
  public:
   explicit WindowPrivate(Window* window);
   ~WindowPrivate();
@@ skipping 56 matching lines @@
   void LocalSetOpacity(float opacity) { window_->LocalSetOpacity(opacity); }
   void LocalSetPredefinedCursor(mojom::Cursor cursor) {
     window_->LocalSetPredefinedCursor(cursor);
   }
   void LocalSetSharedProperty(const std::string& name,
                               mojo::Array<uint8_t> new_data);
   void LocalSetSharedProperty(const std::string& name,
                               const std::vector<uint8_t>* data) {
     window_->LocalSetSharedProperty(name, data);
   }
-  void LocalSetSurfaceId(std::unique_ptr<SurfaceInfo> surface_info) {
-    window_->LocalSetSurfaceId(std::move(surface_info));
-  }
-
   void NotifyWindowStackingChanged() { window_->NotifyWindowStackingChanged(); }
 
  private:
   Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowPrivate);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_PRIVATE_H_