Fixes problems with drawn state

components/mus/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 COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_
 #define COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 40 matching lines @@
 
   // Returns a string description of this.
   std::string ToString() const;
 
   // Returns a string description that includes visible and drawn.
   std::string ToString2() const;
 
   Id parent_id;
   Id window_id;
   bool visible;
-  bool drawn;
   std::map<std::string, std::vector<uint8_t>> properties;
 };
 
 // Tracks a call to WindowTreeClient. See the individual functions for the
 // fields that are used.
 struct Change {
   Change();
   Change(const Change& other);
   ~Change();
 
@@ skipping 15 matching lines @@
   uint32_t change_id;
 };
 
 // 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);
 
 // Convenience for returning the description of the first item in |windows|.
 // Returns an empty string if |windows| has something other than one entry.
 std::string SingleWindowDescription(const std::vector<TestWindow>& windows);
 
 // Returns a string description of |changes[0].windows|. Returns an empty string
 // if change.size() != 1.
 std::string ChangeWindowDescription(const std::vector<Change>& changes);
 
 // Converts WindowDatas to TestWindows.
@@ skipping 16 matching lines @@
 
   TestChangeTracker();
   ~TestChangeTracker();
 
   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
 
   std::vector<Change>* changes() { return &changes_; }
 
   // Each of these functions generate a Change. There is one per
   // WindowTreeClient function.
-  void OnEmbed(ConnectionSpecificId connection_id, mojom::WindowDataPtr root);
+  void OnEmbed(ConnectionSpecificId connection_id,
+               mojom::WindowDataPtr root,
+               bool drawn);
   void OnEmbeddedAppDisconnected(Id window_id);
   void OnUnembed(Id window_id);
   void OnLostCapture(Id window_id);
   void OnTransientWindowAdded(Id window_id, Id transient_window_id);
   void OnTransientWindowRemoved(Id window_id, Id transient_window_id);
   void OnWindowBoundsChanged(Id window_id,
                              mojo::RectPtr old_bounds,
                              mojo::RectPtr new_bounds);
   void OnWindowViewportMetricsChanged(mojom::ViewportMetricsPtr old_bounds,
                                       mojom::ViewportMetricsPtr new_bounds);
   void OnWindowHierarchyChanged(Id window_id,
                                 Id new_parent_id,
                                 Id old_parent_id,
                                 mojo::Array<mojom::WindowDataPtr> windows);
   void OnWindowReordered(Id window_id,
                          Id relative_window_id,
                          mojom::OrderDirection direction);
   void OnWindowDeleted(Id window_id);
   void OnWindowVisibilityChanged(Id window_id, bool visible);
-  void OnWindowDrawnStateChanged(Id window_id, bool drawn);
+  void OnWindowParentDrawnStateChanged(Id window_id, bool drawn);
   void OnWindowInputEvent(Id window_id, mojom::EventPtr event);
   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);
+  void OnTopLevelCreated(uint32_t change_id,
+                         mojom::WindowDataPtr window_data,
+                         bool drawn);
 
  private:
   void AddChange(const Change& change);
 
   Delegate* delegate_;
   std::vector<Change> changes_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChangeTracker);
 };
 
 }  // namespace ws
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_