More user id tracking for mus:

components/mus/ws/window_tree_impl.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_WINDOW_TREE_IMPL_H_
 #define COMPONENTS_MUS_WS_WINDOW_TREE_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 21 matching lines @@
 namespace mus {
 namespace ws {
 
 class AccessPolicy;
 class ConnectionManager;
 class ServerWindow;
 class TargetedEvent;
 class WindowTreeHostImpl;
 class WindowTreeTest;
 
+namespace test {
+class WindowTreeTestApi;
+}
+
 // An instance of WindowTreeImpl is created for every WindowTree request.
 // WindowTreeImpl tracks all the state and windows created by a client.
 // WindowTreeImpl coordinates with ConnectionManager to update the client (and
 // internal state) as necessary.
 class WindowTreeImpl : public mojom::WindowTree,
                        public AccessPolicyDelegate,
                        public mojom::WindowManagerClient {
  public:
   WindowTreeImpl(ConnectionManager* connection_manager,
                  ServerWindow* root,
@@ skipping 122 matching lines @@
   void ProcessLostCapture(const ServerWindow* old_lost_capture,
                           bool originated_change);
   void ProcessTransientWindowAdded(const ServerWindow* window,
                                    const ServerWindow* transient_window,
                                    bool originated_change);
   void ProcessTransientWindowRemoved(const ServerWindow* window,
                                      const ServerWindow* transient_window,
                                      bool originated_change);
 
  private:
-  friend class WindowTreeTest;
+  friend class test::WindowTreeTestApi;
 
   struct WaitingForTopLevelWindowInfo {
     WaitingForTopLevelWindowInfo(const ClientWindowId& client_window_id,
                                  uint32_t wm_change_id)
         : client_window_id(client_window_id), wm_change_id(wm_change_id) {}
     ~WaitingForTopLevelWindowInfo() {}
 
     // Id supplied from the client.
     ClientWindowId client_window_id;
 
@@ skipping 210 matching lines @@
 
   scoped_ptr<WaitingForTopLevelWindowInfo> waiting_for_top_level_window_info_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeImpl);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_WINDOW_TREE_IMPL_H_