Support creation of toplevel mus::Windows on separate displays

ash/mus/test/wm_test_base.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 ASH_MUS_TEST_WM_TEST_BASE_H_
 #define ASH_MUS_TEST_WM_TEST_BASE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 33 matching lines @@
   // Update the display configuration as given in |display_spec|.
   // See test::DisplayManagerTestApi::UpdateDisplay for more details.
   void UpdateDisplay(const std::string& display_spec);
 
   ui::Window* GetPrimaryRootWindow();
   ui::Window* GetSecondaryRootWindow();
 
   display::Display GetPrimaryDisplay();
   display::Display GetSecondaryDisplay();
 
+  RootWindowController* GetPrimaryRootWindowController();
+  RootWindowController* GetSecondaryRootWindowController();
+
   // Creates a top level window visible window in the appropriate container.
   // NOTE: you can explicitly destroy the returned value if necessary, but it
   // will also be automatically destroyed when the WindowTreeClient is
   // destroyed.
   ui::Window* CreateTestWindow(const gfx::Rect& bounds);
   ui::Window* CreateTestWindow(const gfx::Rect& bounds,
                                ui::wm::WindowType window_type);
+
   ui::Window* CreateFullscreenTestWindow();
+  ui::Window* CreateFullscreenTestWindow(RootWindowController* root);
 
   // Creates a window parented to |parent|. The returned window is visible.
   ui::Window* CreateChildTestWindow(ui::Window* parent,
                                     const gfx::Rect& bounds);
 
  protected:
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
  private:
   friend class AshTestImplMus;
-

[mfomitchev, 2016/11/18 17:36:24]

DOn't remove this blank line.

[thanhph, 2016/11/18 19:15:44]

Done.

   bool setup_called_ = false;
   bool teardown_called_ = false;
   std::unique_ptr<WmTestHelper> test_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(WmTestBase);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_TEST_WM_TEST_BASE_H_