Fix window/display bounds with multiple windows in mus.

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 219 matching lines @@
   WindowServer* window_server_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayBinding);
 };
 
 // -----------------------------------------------------------------------------
 
 // Factory that dispenses TestPlatformDisplays.
 class TestPlatformDisplayFactory : public PlatformDisplayFactory {
  public:
+  static const int64_t kFirstDisplayId;
+
   explicit TestPlatformDisplayFactory(int32_t* cursor_id_storage);
   ~TestPlatformDisplayFactory();
 
   // PlatformDisplayFactory:
   PlatformDisplay* CreatePlatformDisplay() override;
 
  private:
   int32_t* cursor_id_storage_;
-  int64_t next_display_id_ = 1;
+  int64_t next_display_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplayFactory);
 };
 
 // -----------------------------------------------------------------------------
 
 // A stub implementation of FrameGeneratorDelegate.
 class TestFrameGeneratorDelegate : public FrameGeneratorDelegate {
  public:
   explicit TestFrameGeneratorDelegate(std::unique_ptr<ServerWindow> root);
@@ skipping 313 matching lines @@
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_