Mojo C++ bindings: switch services/ui/public/interfaces mojom target to use STL types.

services/ui/ws/window_tree_unittest.cc

 // 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.
 
 #include "services/ui/ws/window_tree.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
@@ skipping 613 matching lines @@
 TEST_F(WindowTreeTest, NewTopLevelWindow) {
   TestWindowManager wm_internal;
   set_window_manager_internal(wm_tree(), &wm_internal);
 
   TestWindowTreeBinding* child_binding;
   WindowTree* child_tree = CreateNewTree(wm_tree()->user_id(), &child_binding);
   child_binding->client()->tracker()->changes()->clear();
   child_binding->client()->set_record_on_change_completed(true);
 
   // Create a new top level window.
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> properties;
+  std::unordered_map<std::string, std::vector<uint8_t>> properties;
   const uint32_t initial_change_id = 17;
   // Explicitly use an id that does not contain the client id.
   const ClientWindowId embed_window_id2_in_child(45 << 16 | 27);
   static_cast<mojom::WindowTree*>(child_tree)
       ->NewTopLevelWindow(initial_change_id, embed_window_id2_in_child.id,
-                          std::move(properties));
+                          properties);
 
   // The binding should be paused until the wm acks the change.
   uint32_t wm_change_id = 0u;
   ASSERT_TRUE(wm_internal.did_call_create_top_level_window(&wm_change_id));
   EXPECT_TRUE(child_binding->is_paused());
 
   // Create the window for |embed_window_id2_in_child|.
   const ClientWindowId embed_window_id2 = BuildClientWindowId(wm_tree(), 2);
   EXPECT_TRUE(
       wm_tree()->NewWindow(embed_window_id2, ServerWindow::Properties()));
@@ skipping 422 matching lines @@
 TEST_F(WindowTreeTest, ValidMoveLoopWithWM) {
   TestWindowManager wm_internal;
   set_window_manager_internal(wm_tree(), &wm_internal);
 
   TestWindowTreeBinding* child_binding;
   WindowTree* child_tree = CreateNewTree(wm_tree()->user_id(), &child_binding);
   child_binding->client()->tracker()->changes()->clear();
   child_binding->client()->set_record_on_change_completed(true);
 
   // Create a new top level window.
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> properties;
+  std::unordered_map<std::string, std::vector<uint8_t>> properties;
   const uint32_t initial_change_id = 17;
   // Explicitly use an id that does not contain the client id.
   const ClientWindowId embed_window_id2_in_child(45 << 16 | 27);
   static_cast<mojom::WindowTree*>(child_tree)
       ->NewTopLevelWindow(initial_change_id, embed_window_id2_in_child.id,
-                          std::move(properties));
+                          properties);
 
   // The binding should be paused until the wm acks the change.
   uint32_t wm_change_id = 0u;
   ASSERT_TRUE(wm_internal.did_call_create_top_level_window(&wm_change_id));
   EXPECT_TRUE(child_binding->is_paused());
 
   // Create the window for |embed_window_id2_in_child|.
   const ClientWindowId embed_window_id2 = BuildClientWindowId(wm_tree(), 2);
   EXPECT_TRUE(
       wm_tree()->NewWindow(embed_window_id2, ServerWindow::Properties()));
@@ skipping 18 matching lines @@
 TEST_F(WindowTreeTest, MoveLoopAckOKByWM) {
   TestMoveLoopWindowManager wm_internal(wm_tree());
   set_window_manager_internal(wm_tree(), &wm_internal);
 
   TestWindowTreeBinding* child_binding;
   WindowTree* child_tree = CreateNewTree(wm_tree()->user_id(), &child_binding);
   child_binding->client()->tracker()->changes()->clear();
   child_binding->client()->set_record_on_change_completed(true);
 
   // Create a new top level window.
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> properties;
+  std::unordered_map<std::string, std::vector<uint8_t>> properties;
   const uint32_t initial_change_id = 17;
   // Explicitly use an id that does not contain the client id.
   const ClientWindowId embed_window_id2_in_child(45 << 16 | 27);
   static_cast<mojom::WindowTree*>(child_tree)
       ->NewTopLevelWindow(initial_change_id, embed_window_id2_in_child.id,
-                          std::move(properties));
+                          properties);
 
   // The binding should be paused until the wm acks the change.
   uint32_t wm_change_id = 0u;
   ASSERT_TRUE(wm_internal.did_call_create_top_level_window(&wm_change_id));
   EXPECT_TRUE(child_binding->is_paused());
 
   // Create the window for |embed_window_id2_in_child|.
   const ClientWindowId embed_window_id2 = BuildClientWindowId(wm_tree(), 2);
   EXPECT_TRUE(
       wm_tree()->NewWindow(embed_window_id2, ServerWindow::Properties()));
@@ skipping 28 matching lines @@
 TEST_F(WindowTreeTest, WindowManagerCantMoveLoop) {
   TestWindowManager wm_internal;
   set_window_manager_internal(wm_tree(), &wm_internal);
 
   TestWindowTreeBinding* child_binding;
   WindowTree* child_tree = CreateNewTree(wm_tree()->user_id(), &child_binding);
   child_binding->client()->tracker()->changes()->clear();
   child_binding->client()->set_record_on_change_completed(true);
 
   // Create a new top level window.
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> properties;
+  std::unordered_map<std::string, std::vector<uint8_t>> properties;
   const uint32_t initial_change_id = 17;
   // Explicitly use an id that does not contain the client id.
   const ClientWindowId embed_window_id2_in_child(45 << 16 | 27);
   static_cast<mojom::WindowTree*>(child_tree)
       ->NewTopLevelWindow(initial_change_id, embed_window_id2_in_child.id,
-                          std::move(properties));
+                          properties);
 
   // The binding should be paused until the wm acks the change.
   uint32_t wm_change_id = 0u;
   ASSERT_TRUE(wm_internal.did_call_create_top_level_window(&wm_change_id));
   EXPECT_TRUE(child_binding->is_paused());
 
   // Create the window for |embed_window_id2_in_child|.
   const ClientWindowId embed_window_id2 = BuildClientWindowId(wm_tree(), 2);
   EXPECT_TRUE(
       wm_tree()->NewWindow(embed_window_id2, ServerWindow::Properties()));
@@ skipping 18 matching lines @@
 TEST_F(WindowTreeTest, RevertWindowBoundsOnMoveLoopFailure) {
   TestWindowManager wm_internal;
   set_window_manager_internal(wm_tree(), &wm_internal);
 
   TestWindowTreeBinding* child_binding;
   WindowTree* child_tree = CreateNewTree(wm_tree()->user_id(), &child_binding);
   child_binding->client()->tracker()->changes()->clear();
   child_binding->client()->set_record_on_change_completed(true);
 
   // Create a new top level window.
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> properties;
+  std::unordered_map<std::string, std::vector<uint8_t>> properties;
   const uint32_t initial_change_id = 17;
   // Explicitly use an id that does not contain the client id.
   const ClientWindowId embed_window_id2_in_child(45 << 16 | 27);
   static_cast<mojom::WindowTree*>(child_tree)
       ->NewTopLevelWindow(initial_change_id, embed_window_id2_in_child.id,
-                          std::move(properties));
+                          properties);
 
   // The binding should be paused until the wm acks the change.
   uint32_t wm_change_id = 0u;
   ASSERT_TRUE(wm_internal.did_call_create_top_level_window(&wm_change_id));
   EXPECT_TRUE(child_binding->is_paused());
 
   // Create the window for |embed_window_id2_in_child|.
   const ClientWindowId embed_window_id2 = BuildClientWindowId(wm_tree(), 2);
   EXPECT_TRUE(
       wm_tree()->NewWindow(embed_window_id2, ServerWindow::Properties()));
@@ skipping 128 matching lines @@
     client->tracker()->changes()->clear();
   }
 
   // Client should not have got any messages after shutdown.
   EXPECT_TRUE(client->tracker()->changes()->empty());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui