Support creation of toplevel mus::Windows on separate displays

ash/mus/test/wm_test_base.cc

Index: ash/mus/test/wm_test_base.cc
diff --git a/ash/mus/test/wm_test_base.cc b/ash/mus/test/wm_test_base.cc
index c45eb6e73457fd27f8e573754940c7f90f90f533..fff2d7906ce9a3c6696f07593b69ec8c8b286925 100644
--- a/ash/mus/test/wm_test_base.cc
+++ b/ash/mus/test/wm_test_base.cc
@@ -14,7 +14,6 @@
 #include "ash/mus/window_manager_application.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window_tree_client.h"
-#include "ui/display/display.h"
 
 namespace ash {
 namespace mus {
@@ -123,11 +122,17 @@ ui::Window* WmTestBase::CreateTestWindow(const gfx::Rect& bounds,
   return window;
 }
 
-ui::Window* WmTestBase::CreateFullscreenTestWindow() {
+ui::Window* WmTestBase::CreateFullscreenTestWindow(int64_t display_id) {
   std::map<std::string, std::vector<uint8_t>> properties;
   properties[ui::mojom::WindowManager::kShowState_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN));
+
+  if (display_id > -1) {

[kylechar, 2016/11/23 14:14:20]

if (display_id != display::kInvalidDisplayId) { ... }

[thanhph, 2016/11/23 14:26:19]

Done.

+    properties[ui::mojom::WindowManager::kInitialDisplayId_Property] =
+        mojo::ConvertTo<std::vector<uint8_t>>(display_id);
+  }
+
   ui::Window* window = test_helper_->GetRootsOrderedByDisplayId()[0]
                            ->window_manager()
                            ->NewTopLevelWindow(&properties);