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

ui/aura/test/mus/test_window_tree.cc

 // Copyright 2015 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 "ui/aura/test/mus/test_window_tree.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace aura {
 
 TestWindowTree::TestWindowTree() {}
 
 TestWindowTree::~TestWindowTree() {}
 
 bool TestWindowTree::WasEventAcked(uint32_t event_id) const {
   return acked_events_.count(event_id);
 }
 
-mojo::Array<uint8_t> TestWindowTree::GetLastPropertyValue() {
+base::Optional<std::vector<uint8_t>> TestWindowTree::GetLastPropertyValue() {
   return std::move(last_property_value_);
 }
 
-mojo::Map<mojo::String, mojo::Array<uint8_t>>
+base::Optional<std::unordered_map<std::string, std::vector<uint8_t>>>
 TestWindowTree::GetLastNewWindowProperties() {
   return std::move(last_new_window_properties_);
 }
 
 void TestWindowTree::AckAllChanges() {
   while (!changes_.empty()) {
     client_->OnChangeCompleted(changes_[0].id, true);
     changes_.erase(changes_.begin());
   }
 }
@@ skipping 61 matching lines @@
 }
 
 void TestWindowTree::OnChangeReceived(uint32_t change_id,
                                       WindowTreeChangeType type) {
   changes_.push_back({type, change_id});
 }
 
 void TestWindowTree::NewWindow(
     uint32_t change_id,
     uint32_t window_id,
-    mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) {
-  last_new_window_properties_ = std::move(properties);
+    const base::Optional<std::unordered_map<std::string, std::vector<uint8_t>>>&
+        properties) {
+  last_new_window_properties_ = properties;
   OnChangeReceived(change_id, WindowTreeChangeType::NEW_WINDOW);
 }
 
 void TestWindowTree::NewTopLevelWindow(
     uint32_t change_id,
     uint32_t window_id,
-    mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) {
-  last_new_window_properties_ = std::move(properties);
+    const std::unordered_map<std::string, std::vector<uint8_t>>& properties) {
+  last_new_window_properties_.emplace(properties);
   window_id_ = window_id;
   OnChangeReceived(change_id, WindowTreeChangeType::NEW_TOP_LEVEL);
 }
 
 void TestWindowTree::DeleteWindow(uint32_t change_id, uint32_t window_id) {
   OnChangeReceived(change_id);
 }
 
 void TestWindowTree::SetWindowBounds(uint32_t change_id,
                                      uint32_t window_id,
                                      const gfx::Rect& bounds) {
   OnChangeReceived(change_id, WindowTreeChangeType::BOUNDS);
 }
 
 void TestWindowTree::SetClientArea(
     uint32_t window_id,
     const gfx::Insets& insets,
-    mojo::Array<gfx::Rect> additional_client_areas) {}
+    const base::Optional<std::vector<gfx::Rect>>& additional_client_areas) {}
 
 void TestWindowTree::SetHitTestMask(uint32_t window_id,
                                     const base::Optional<gfx::Rect>& mask) {}
 
 void TestWindowTree::SetCanAcceptDrops(uint32_t window_id, bool accepts_drops) {
 }
 
 void TestWindowTree::SetWindowVisibility(uint32_t change_id,
                                          uint32_t window_id,
                                          bool visible) {
   OnChangeReceived(change_id, WindowTreeChangeType::VISIBLE);
 }
 
-void TestWindowTree::SetWindowProperty(uint32_t change_id,
-                                       uint32_t window_id,
-                                       const mojo::String& name,
-                                       mojo::Array<uint8_t> value) {
-  last_property_value_ = std::move(value);
+void TestWindowTree::SetWindowProperty(
+    uint32_t change_id,
+    uint32_t window_id,
+    const std::string& name,
+    const base::Optional<std::vector<uint8_t>>& value) {
+  last_property_value_ = value;
   OnChangeReceived(change_id, WindowTreeChangeType::PROPERTY);
 }
 
 void TestWindowTree::SetWindowOpacity(uint32_t change_id,
                                       uint32_t window_id,
                                       float opacity) {
   OnChangeReceived(change_id);
 }
 
 void TestWindowTree::AttachCompositorFrameSink(
@@ skipping 93 matching lines @@
 }
 
 void TestWindowTree::GetCursorLocationMemory(
     const GetCursorLocationMemoryCallback& callback) {
   callback.Run(mojo::ScopedSharedBufferHandle());
 }
 
 void TestWindowTree::PerformDragDrop(
     uint32_t change_id,
     uint32_t source_window_id,
-    mojo::Map<mojo::String, mojo::Array<uint8_t>> drag_data,
+    const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data,
     uint32_t drag_operation) {
   OnChangeReceived(change_id);
 }
 
 void TestWindowTree::CancelDragDrop(uint32_t window_id) {}
 
 void TestWindowTree::PerformWindowMove(uint32_t change_id,
                                        uint32_t window_id,
                                        ui::mojom::MoveLoopSource source,
                                        const gfx::Point& cursor_location) {
   OnChangeReceived(change_id);
 }
 
 void TestWindowTree::CancelWindowMove(uint32_t window_id) {}
 
 }  // namespace aura