Remove mojo::Map.

services/ui/ws/window_tree.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 <stddef.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "mojo/public/cpp/bindings/stl_converters.h"
+#include "mojo/public/cpp/bindings/map.h"
 #include "services/ui/ws/default_access_policy.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/event_matcher.h"
 #include "services/ui/ws/focus_controller.h"
 #include "services/ui/ws/operation.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
 #include "services/ui/ws/server_window_observer.h"
@@ skipping 1613 matching lines @@
   }
 
   // TODO(erg): Dealing with |drag_representation| is hard, so we're going to
   // deal with that later.
 
   // Here, we need to dramatically change how the mouse pointer works. Once
   // we've started a drag drop operation, cursor events don't go to windows as
   // normal.
   WindowManagerState* wms = display_root->window_manager_state();
   window_server_->StartDragLoop(change_id, window, this);
-  wms->SetDragDropSourceWindow(
-      this, window, this, mojo::WrapSTLType(mojo::UnorderedMapToMap(drag_data)),
-      drag_operation);
+  wms->SetDragDropSourceWindow(this, window, this, drag_data, drag_operation);
 }
 
 void WindowTree::CancelDragDrop(Id window_id) {
   ServerWindow* window = GetWindowByClientId(ClientWindowId(window_id));
   if (!window) {
     DVLOG(1) << "CancelDragDrop failed (no window)";
     return;
   }
 
   if (window != window_server_->GetCurrentDragLoopWindow()) {
@@ skipping 287 matching lines @@
     const ServerWindow* window) {
   if (!window)
     return nullptr;
   DragTargetConnection* connection = window_server_->GetTreeWithRoot(window);
   if (connection)
     return connection;
   return window_server_->GetTreeWithId(window->id().client_id);
 }
 
 void WindowTree::PerformOnDragDropStart(
-    mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data) {
-  client()->OnDragDropStart(
-      mojo::MapToUnorderedMap(mojo::UnwrapToSTLType(std::move(mime_data))));
+    std::unordered_map<std::string, std::vector<uint8_t>> mime_data) {
+  client()->OnDragDropStart(std::move(mime_data));
 }
 
 void WindowTree::PerformOnDragEnter(
     const ServerWindow* window,
     uint32_t event_flags,
     const gfx::Point& cursor_offset,
     uint32_t effect_bitmask,
     const base::Callback<void(uint32_t)>& callback) {
   ClientWindowId client_window_id;
   if (!IsWindowKnown(window, &client_window_id)) {
@@ skipping 45 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui