Remove mojo::Map.

services/ui/ws/drag_controller.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 SERVICES_UI_WS_DRAG_CONTROLLER_H_
 #define SERVICES_UI_WS_DRAG_CONTROLLER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 19 matching lines @@
 
 // A bitmask of ui::mojom::kDropEffect operations.
 using DropEffectBitmask = uint32_t;
 
 // Represents all the data around the current ongoing drag operation.
 //
 // There should only be one instance of this class per userid. The
 // WindowManagerState's EventDispatcher creates and owns this instance.
 class DragController : public ServerWindowObserver {
  public:
-  DragController(DragCursorUpdater* cursor_updater,
-                 DragSource* source,
-                 ServerWindow* source_window,
-                 DragTargetConnection* source_connection,
-                 int32_t drag_pointer,
-                 mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data,
-                 DropEffectBitmask drag_operations);
+  DragController(
+      DragCursorUpdater* cursor_updater,
+      DragSource* source,
+      ServerWindow* source_window,
+      DragTargetConnection* source_connection,
+      int32_t drag_pointer,
+      std::unordered_map<std::string, std::vector<uint8_t>> mime_data,

[yzshen1, 2017/01/03 19:07:48]

Does it make sense to make this const&? It is not very common to pass copyable
objects by value.

(here and elsewhere)

[Sam McNally, 2017/01/03 23:24:03]

Done.

+      DropEffectBitmask drag_operations);
   ~DragController() override;
 
   ui::mojom::Cursor current_cursor() const { return current_cursor_; }
 
   // Cancels the current drag, ie, due to the user pressing Escape.
   void Cancel();
 
   // Responds to a pointer move/release event. Returns true if the event was
   // handled by the drag.
   bool DispatchPointerEvent(const ui::PointerEvent& event,
@@ skipping 66 matching lines @@
   // we have to continue to exist, but not process any more pointer events.
   bool waiting_for_final_drop_response_ = false;
 
   ServerWindow* source_window_;
   ServerWindow* current_target_window_ = nullptr;
 
   // The target connection that |source_window_| is part of.
   DragTargetConnection* source_connection_;
 
   // A list of the offered mime types.
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data_;
+  std::unordered_map<std::string, std::vector<uint8_t>> mime_data_;
 
   // We need to keep track of state on a per window basis. A window being in
   // this map means that we're observing it. WindowState also keeps track of
   // what type of operation we're waiting for a response from the window's
   // client, along with a queued operation to send when we get a reply.
   std::map<ServerWindow*, WindowState> window_state_;
 
   // A set of DragTargetConnections* which have received the
   // PerformOnDragMimeTypes() call.
   std::set<DragTargetConnection*> called_on_drag_mime_types_;
 
   base::WeakPtrFactory<DragController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DragController);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DRAG_CONTROLLER_H_