Fixes bugs in cursor handling

services/ui/ws/test_utils.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 SERVICES_UI_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 594 matching lines @@
   ~WindowEventTargetingHelper();
 
   // Creates |window| as an embeded window of the primary tree. This window is a
   // root window of its own tree, with bounds |window_bounds|. The bounds of the
   // root window of |display_| are defined by |root_window_bounds|.
   ServerWindow* CreatePrimaryTree(const gfx::Rect& root_window_bounds,
                                   const gfx::Rect& window_bounds);
   // Creates a secondary tree, embedded as a child of |embed_window|. The
   // resulting |window| is setup for event targeting, with bounds
   // |window_bounds|.
+  // TODO(sky): rename and cleanup. This doesn't really create a new tree.
   void CreateSecondaryTree(ServerWindow* embed_window,
                            const gfx::Rect& window_bounds,
                            TestWindowTreeClient** out_client,
                            WindowTree** window_tree,
                            ServerWindow** window);
   // Sets the task runner for |message_loop_|
   void SetTaskRunner(scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
   mojom::Cursor cursor() const { return ws_test_helper_.cursor(); }
   Display* display() { return display_; }
   TestWindowTreeBinding* last_binding() {
     return ws_test_helper_.window_server_delegate()->last_binding();
   }
   TestWindowTreeClient* last_window_tree_client() {
     return ws_test_helper_.window_server_delegate()->last_client();
   }
   TestWindowTreeClient* wm_client() { return wm_client_; }
   WindowServer* window_server() { return ws_test_helper_.window_server(); }
 
  private:
   WindowServerTestHelper ws_test_helper_;
   // TestWindowTreeClient that is used for the WM client. Owned by
   // |window_server_delegate_|
   TestWindowTreeClient* wm_client_ = nullptr;
   // Owned by WindowServer
   TestDisplayBinding* display_binding_ = nullptr;
   // Owned by WindowServer's DisplayManager.
   Display* display_ = nullptr;
+  ClientSpecificId next_primary_tree_window_id_ = 1;
 
   DISALLOW_COPY_AND_ASSIGN(WindowEventTargetingHelper);
 };
 
 // -----------------------------------------------------------------------------
 
 // Adds a new WM to |window_server| for |user_id|. Creates
 // WindowManagerWindowTreeFactory and associated WindowTree for the WM.
 void AddWindowManager(WindowServer* window_server, const UserId& user_id);
 
@@ skipping 16 matching lines @@
 
 // Returns |tree|s ClientWindowId for |window|.
 ClientWindowId ClientWindowIdForWindow(WindowTree* tree,
                                        const ServerWindow* window);
 
 // Creates a new visible window as a child of the single root of |tree|.
 // |client_id| is set to the ClientWindowId of the new window.
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
-                                        ClientWindowId* client_id);
+                                        ClientWindowId* client_id = nullptr);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_