Revert of Mus+Ash: propagate Surface ID to parents

services/ui/ws/test_change_tracker.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_WS_TEST_CHANGE_TRACKER_H_
 #define SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 24 matching lines @@
   CHANGE_TYPE_NODE_DRAWN_STATE_CHANGED,
   CHANGE_TYPE_NODE_DELETED,
   CHANGE_TYPE_INPUT_EVENT,
   CHANGE_TYPE_POINTER_WATCHER_EVENT,
   CHANGE_TYPE_PROPERTY_CHANGED,
   CHANGE_TYPE_FOCUSED,
   CHANGE_TYPE_CURSOR_CHANGED,
   CHANGE_TYPE_ON_CHANGE_COMPLETED,
   CHANGE_TYPE_ON_TOP_LEVEL_CREATED,
   CHANGE_TYPE_OPACITY,
-  CHANGE_TYPE_SURFACE_CHANGED,
 };
 
 // TODO(sky): consider nuking and converting directly to WindowData.
 struct TestWindow {
   TestWindow();
   TestWindow(const TestWindow& other);
   ~TestWindow();
 
   // Returns a string description of this.
   std::string ToString() const;
@@ skipping 25 matching lines @@
   int32_t event_action;
   bool matches_pointer_watcher;
   mojo::String embed_url;
   mojom::OrderDirection direction;
   bool bool_value;
   float float_value;
   std::string property_key;
   std::string property_value;
   int32_t cursor_id;
   uint32_t change_id;
-  cc::SurfaceId surface_id;
-  cc::SurfaceSequence surface_sequence;
-  gfx::Size frame_size;
-  float device_scale_factor;
 };
 
 // Converts Changes to string descriptions.
 std::vector<std::string> ChangesToDescription1(
     const std::vector<Change>& changes);
 
 // Convenience for returning the description of the first item in |changes|.
 // Returns an empty string if |changes| has something other than one entry.
 std::string SingleChangeToDescription(const std::vector<Change>& changes);
 std::string SingleChangeToDescription2(const std::vector<Change>& changes);
@@ skipping 62 matching lines @@
                               uint32_t window_id);
   void OnWindowSharedPropertyChanged(Id window_id,
                                      mojo::String name,
                                      mojo::Array<uint8_t> data);
   void OnWindowFocused(Id window_id);
   void OnWindowPredefinedCursorChanged(Id window_id, mojom::Cursor cursor_id);
   void OnChangeCompleted(uint32_t change_id, bool success);
   void OnTopLevelCreated(uint32_t change_id,
                          mojom::WindowDataPtr window_data,
                          bool drawn);
-  void OnWindowSurfaceChanged(Id window_id,
-                              const cc::SurfaceId& surface_id,
-                              const cc::SurfaceSequence& surface_sequence,
-                              const gfx::Size& frame_size,
-                              float device_scale_factor);
 
  private:
   void AddChange(const Change& change);
 
   Delegate* delegate_;
   std::vector<Change> changes_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChangeTracker);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_