Remove mojo::Map.

services/ui/ws/drag_controller_unittest.cc

 // 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.
 
 #include "services/ui/ws/drag_controller.h"
 
 #include <map>
 #include <memory>
 #include <queue>
 #include <utility>
@@ skipping 61 matching lines @@
         queued_callbacks_.front().callback.Run(
             respond_with_effect ? queued_callbacks_.front().effect_bitmask : 0);
       }
 
       queued_callbacks_.pop();
     }
   }
 
   // Overridden from DragTestConnection:
   void PerformOnDragDropStart(
-      mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data) override {
+      const std::unordered_map<std::string, std::vector<uint8_t>>& mime_data)
+      override {
     times_received_drag_drop_start_++;
-    mime_data_ = std::move(mime_data);
+    mime_data_ = mime_data;
   }
 
   void PerformOnDragEnter(
       const ServerWindow* window,
       uint32_t key_state,
       const gfx::Point& cursor_offset,
       uint32_t effect_bitmask,
       const base::Callback<void(uint32_t)>& callback) override {
     DCHECK_EQ(window, &window_);
     queued_callbacks_.push({QueuedType::ENTER, key_state, cursor_offset,
@@ skipping 21 matching lines @@
       const ServerWindow* window,
       uint32_t key_state,
       const gfx::Point& cursor_offset,
       uint32_t effect_bitmask,
       const base::Callback<void(uint32_t)>& callback) override {
     DCHECK_EQ(window, &window_);
     queued_callbacks_.push(
         {QueuedType::DROP, key_state, cursor_offset, effect_bitmask, callback});
   }
 
-  void PerformOnDragDropDone() override { mime_data_.SetToEmpty(); }
+  void PerformOnDragDropDone() override { mime_data_.clear(); }
 
  private:
   DragControllerTest* parent_;
   TestServerWindowDelegate window_delegate_;
   ServerWindow window_;
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data_;
+  std::unordered_map<std::string, std::vector<uint8_t>> mime_data_;
   uint32_t times_received_drag_drop_start_ = 0;
 
   std::queue<DragEvent> queued_callbacks_;
 };
 
 class DragControllerTest : public testing::Test,
                            public DragCursorUpdater,
                            public DragSource {
  public:
   std::unique_ptr<DragTestWindow> BuildWindow() {
     WindowId id(1, ++window_id_);
     std::unique_ptr<DragTestWindow> p =
         base::MakeUnique<DragTestWindow>(this, id);
     server_window_by_id_[id] = p->window();
     connection_by_window_[p->window()] = p.get();
     return p;
   }
 
   void StartDragOperation(
-      mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data,
       DragTestWindow* window,
       uint32_t drag_operations) {
-    window->PerformOnDragDropStart(mime_data.Clone());
+    window->PerformOnDragDropStart(
+        std::unordered_map<std::string, std::vector<uint8_t>>());
     drag_operation_ = base::MakeUnique<DragController>(
         this, this, window->window(), window, PointerEvent::kMousePointerId,
-        std::move(mime_data), drag_operations);
+        std::unordered_map<std::string, std::vector<uint8_t>>(),
+        drag_operations);
 
     // It would be nice if we could just let the observer method fire, but it
     // fires during the constructor when we haven't assigned the unique_ptr
     // yet.
     cursor_ = ui::mojom::Cursor(drag_operation_->current_cursor());
   }
 
   void DispatchDrag(DragTestWindow* window,
                     bool mouse_released,
                     uint32_t flags,
@@ skipping 99 matching lines @@
   base::Optional<uint32_t> drag_completed_action_;
   base::Optional<bool> drag_completed_value_;
 };
 
 DragTestWindow::~DragTestWindow() {
   parent_->OnTestWindowDestroyed(this);
 }
 
 TEST_F(DragControllerTest, SimpleDragDrop) {
   std::unique_ptr<DragTestWindow> window = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window.get(), ui::mojom::kDropEffectMove);
 
   EXPECT_EQ(ui::mojom::Cursor::NO_DROP, cursor());
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window->queue_response_type());
   window->Respond(true);
 
   // (Even though we're doing a move, the cursor name is COPY.)
   EXPECT_EQ(ui::mojom::Cursor::COPY, cursor());
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(2, 2));
   EXPECT_EQ(QueuedType::OVER, window->queue_response_type());
   window->Respond(true);
 
   DispatchDrag(window.get(), true, 0, gfx::Point(2, 2));
   EXPECT_EQ(QueuedType::DROP, window->queue_response_type());
   window->Respond(true);
 
   EXPECT_EQ(ui::mojom::kDropEffectMove,
             drag_completed_action().value_or(ui::mojom::kDropEffectNone));
   EXPECT_TRUE(drag_completed_value().value_or(false));
 }
 
 TEST_F(DragControllerTest, FailsOnWindowSayingNo) {
   std::unique_ptr<DragTestWindow> window = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window.get(), ui::mojom::kDropEffectMove);
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window->queue_response_type());
   window->Respond(true);
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(2, 2));
   EXPECT_EQ(QueuedType::OVER, window->queue_response_type());
   window->Respond(true);
 
   DispatchDrag(window.get(), true, 0, gfx::Point(2, 2));
   EXPECT_EQ(QueuedType::DROP, window->queue_response_type());
 
   // Unlike SimpleDragDrop, respond with kDropEffectNone, which should make the
   // drag fail.
   window->Respond(false);
 
   EXPECT_EQ(ui::mojom::kDropEffectNone,
             drag_completed_action().value_or(ui::mojom::kDropEffectCopy));
   EXPECT_FALSE(drag_completed_value().value_or(true));
 }
 
 TEST_F(DragControllerTest, OnlyDeliverMimeDataOnce) {
   std::unique_ptr<DragTestWindow> window1 = BuildWindow();
   std::unique_ptr<DragTestWindow> window2 = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
 
   // The client lib is responsible for sending the data to the window that's
   // the drag source to minimize IPC.
   EXPECT_EQ(0u, window1->times_received_drag_drop_start());
-  StartDragOperation(std::move(mime_data), window1.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window1.get(), ui::mojom::kDropEffectMove);
   EXPECT_EQ(1u, window1->times_received_drag_drop_start());
   DispatchDrag(window1.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   EXPECT_EQ(1u, window1->times_received_drag_drop_start());
   window1->Respond(true);
 
   // Window2 doesn't receive the drag data until mouse is over it.
   EXPECT_EQ(0u, window2->times_received_drag_drop_start());
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(2, 2));
   EXPECT_EQ(1u, window2->times_received_drag_drop_start());
 
   // Moving back to the source window doesn't send an additional start message.
   DispatchDrag(window1.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   EXPECT_EQ(1u, window1->times_received_drag_drop_start());
 
   // Moving back to window2 doesn't send an additional start message.
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   EXPECT_EQ(1u, window2->times_received_drag_drop_start());
 }
 
 TEST_F(DragControllerTest, DeliverMessageToParent) {
   std::unique_ptr<DragTestWindow> window1 = BuildWindow();
   std::unique_ptr<DragTestWindow> window2 = BuildWindow();
   std::unique_ptr<DragTestWindow> window3 = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
 
   window3->SetParent(window2.get());
   window3->OptOutOfDrag();
 
-  StartDragOperation(std::move(mime_data), window1.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window1.get(), ui::mojom::kDropEffectMove);
 
   // Dispatching a drag to window3 (which has can accept drags off) redirects
   // to window2, which is its parent.
   DispatchDrag(window3.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   EXPECT_EQ(1u, window2->times_received_drag_drop_start());
 }
 
 TEST_F(DragControllerTest, FailWhenDropOverNoWindow) {
   std::unique_ptr<DragTestWindow> window = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window.get(), ui::mojom::kDropEffectMove);
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window->queue_response_type());
   window->Respond(true);
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(2, 2));
   EXPECT_EQ(QueuedType::OVER, window->queue_response_type());
   window->Respond(true);
 
   DispatchDrag(nullptr, true, 0, gfx::Point(2, 2));
   // Moving outside of |window| should result in |window| getting a leave.
   EXPECT_EQ(QueuedType::LEAVE, window->queue_response_type());
   window->Respond(true);
 
   EXPECT_FALSE(drag_completed_value().value_or(true));
 }
 
 TEST_F(DragControllerTest, EnterLeaveWhenMovingBetweenTwoWindows) {
   std::unique_ptr<DragTestWindow> window1 = BuildWindow();
   std::unique_ptr<DragTestWindow> window2 = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window1.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window1.get(), ui::mojom::kDropEffectMove);
 
   DispatchDrag(window1.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window1->queue_response_type());
   window1->Respond(true);
 
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(2, 2));
   EXPECT_EQ(QueuedType::ENTER, window2->queue_response_type());
   EXPECT_EQ(QueuedType::LEAVE, window1->queue_response_type());
   window1->Respond(true);
   window2->Respond(true);
 }
 
 TEST_F(DragControllerTest, DeadWindowDoesntBlock) {
   std::unique_ptr<DragTestWindow> window1 = BuildWindow();
   std::unique_ptr<DragTestWindow> window2 = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window1.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window1.get(), ui::mojom::kDropEffectMove);
 
   test::DragControllerTestApi api(drag_operation());
 
   // Simulate a dead window by giving it a few messages, but don't respond to
   // them.
   DispatchDrag(window1.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   DispatchDrag(window1.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(2, 2));
   EXPECT_EQ(1u, window1->queue_size());
   EXPECT_EQ(2u, api.GetSizeOfQueueForWindow(window1->window()));
 
   // Moving to window2 should dispatch the enter event to it immediately.
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(3, 3));
   EXPECT_EQ(QueuedType::ENTER, window2->queue_response_type());
   EXPECT_EQ(1u, window1->queue_size());
 }
 
 TEST_F(DragControllerTest, EnterToOverQueued) {
   std::unique_ptr<DragTestWindow> window = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window.get(), ui::mojom::kDropEffectMove);
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(1, 1));
   ASSERT_EQ(1u, window->queue_size());
   EXPECT_EQ(QueuedType::ENTER, window->queue_response_type());
   // Don't respond.
 
   // We don't receive another message since we haven't acknowledged the first.
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(1, 2));
   ASSERT_EQ(1u, window->queue_size());
 
   // Responding causes us to receive our next event.
   window->Respond(true);
   ASSERT_EQ(1u, window->queue_size());
   EXPECT_EQ(QueuedType::OVER, window->queue_response_type());
 }
 
 TEST_F(DragControllerTest, CoalesceMouseOverEvents) {
   std::unique_ptr<DragTestWindow> window = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window.get(), ui::mojom::kDropEffectMove);
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window->queue_response_type());
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(1, 2));
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(2, 2));
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(2, 3));
 
   // Responding to the first delivers us the last mouse over event's position.
   window->Respond(true);
   ASSERT_EQ(1u, window->queue_size());
   EXPECT_EQ(QueuedType::OVER, window->queue_response_type());
   EXPECT_EQ(gfx::Point(2, 3), window->queue_front().cursor_offset);
 
   // There are no queued events because they were coalesced.
   window->Respond(true);
   EXPECT_EQ(0u, window->queue_size());
 }
 
 TEST_F(DragControllerTest, RemovePendingMouseOversOnLeave) {
   std::unique_ptr<DragTestWindow> window1 = BuildWindow();
   std::unique_ptr<DragTestWindow> window2 = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window1.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window1.get(), ui::mojom::kDropEffectMove);
 
   // Enter
   DispatchDrag(window1.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window1->queue_response_type());
 
   // Over
   DispatchDrag(window1.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
 
   // Leave
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
 
   // The window finally responds to the enter message; we should not receive
   // any over messages since we didn't respond to the enter message in time.
   window1->Respond(true);
   ASSERT_EQ(1u, window1->queue_size());
   EXPECT_EQ(QueuedType::LEAVE, window1->queue_response_type());
 }
 
 TEST_F(DragControllerTest, TargetWindowClosedWhileDrag) {
   std::unique_ptr<DragTestWindow> window1 = BuildWindow();
   std::unique_ptr<DragTestWindow> window2 = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window1.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window1.get(), ui::mojom::kDropEffectMove);
 
   test::DragControllerTestApi api(drag_operation());
 
   // Send some events to |window|.
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window2->queue_response_type());
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
 
@@ skipping 10 matching lines @@
   EXPECT_EQ(0u, api.GetSizeOfQueueForWindow(server_window));
   EXPECT_EQ(nullptr, api.GetCurrentTarget());
 
   // But a target window closing out from under us doesn't fail the drag.
   EXPECT_FALSE(drag_completed_value().has_value());
 }
 
 TEST_F(DragControllerTest, TargetWindowClosedResetsCursor) {
   std::unique_ptr<DragTestWindow> window1 = BuildWindow();
   std::unique_ptr<DragTestWindow> window2 = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window1.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window1.get(), ui::mojom::kDropEffectMove);
   EXPECT_EQ(ui::mojom::Cursor::NO_DROP, cursor());
 
   // Send some events to |window|.
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window2->queue_response_type());
   window2->Respond(true);
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   window2->Respond(true);
   EXPECT_EQ(ui::mojom::Cursor::COPY, cursor());
 
   // Force the destruction of |window.window|.
   window2.reset();
 
   // The cursor no loner indicates that it can drop on |window2|.
   EXPECT_EQ(ui::mojom::Cursor::NO_DROP, cursor());
 }
 
 TEST_F(DragControllerTest, SourceWindowClosedWhileDrag) {
   std::unique_ptr<DragTestWindow> window1 = BuildWindow();
   std::unique_ptr<DragTestWindow> window2 = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window1.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window1.get(), ui::mojom::kDropEffectMove);
 
   test::DragControllerTestApi api(drag_operation());
 
   // Send some events to |windoww|.
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window2->queue_response_type());
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
 
   ServerWindow* server_window = window2->window();
 
   // Ensure that DragController is waiting for a response from |window2|.
   EXPECT_EQ(2u, api.GetSizeOfQueueForWindow(server_window));
   EXPECT_EQ(server_window, api.GetCurrentTarget());
 
   // Force the destruction of the source window.
   window1.reset();
 
   // The source window going away fails the drag.
   EXPECT_FALSE(drag_completed_value().value_or(true));
 }
 
 TEST_F(DragControllerTest, DontQueueEventsAfterDrop) {
   // The DragController needs to stick around to coordinate the drop, but
   // it should ignore further mouse events during this time.
   std::unique_ptr<DragTestWindow> window = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window.get(), ui::mojom::kDropEffectMove);
 
   test::DragControllerTestApi api(drag_operation());
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window->queue_response_type());
   window->Respond(true);
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(2, 2));
   EXPECT_EQ(QueuedType::OVER, window->queue_response_type());
   window->Respond(true);
 
   DispatchDrag(window.get(), true, 0, gfx::Point(2, 2));
   EXPECT_EQ(QueuedType::DROP, window->queue_response_type());
   EXPECT_EQ(1u, api.GetSizeOfQueueForWindow(window->window()));
 
   // Further located events don't result in additional drag messages.
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(2, 2));
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(2, 2));
   EXPECT_EQ(1u, api.GetSizeOfQueueForWindow(window->window()));
 }
 
 TEST_F(DragControllerTest, CancelDrag) {
   // The DragController needs to stick around to coordinate the drop, but
   // it should ignore further mouse events during this time.
   std::unique_ptr<DragTestWindow> window = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window.get(), ui::mojom::kDropEffectMove);
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window->queue_response_type());
   window->Respond(true);
 
   drag_operation()->Cancel();
 
   EXPECT_FALSE(drag_completed_value().value_or(true));
 }
 
 TEST_F(DragControllerTest, IgnoreEventsFromOtherPointers) {
   std::unique_ptr<DragTestWindow> window = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
   // This starts the operation with PointerEvent::kMousePointerId.
-  StartDragOperation(std::move(mime_data), window.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window.get(), ui::mojom::kDropEffectMove);
 
   // Ignore events from pointer 5.
   DispatchDragWithPointer(window.get(), 5, false, ui::EF_LEFT_MOUSE_BUTTON,
                           gfx::Point(1, 1));
   ASSERT_EQ(0u, window->queue_size());
 }
 
 TEST_F(DragControllerTest, RejectingWindowHasProperCursor) {
   std::unique_ptr<DragTestWindow> window = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window.get(), ui::mojom::kDropEffectMove);
 
   EXPECT_EQ(ui::mojom::Cursor::NO_DROP, cursor());
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window->queue_response_type());
   window->Respond(true);
 
   EXPECT_EQ(ui::mojom::Cursor::COPY, cursor());
 
   DispatchDrag(window.get(), false, ui::EF_LEFT_MOUSE_BUTTON, gfx::Point(2, 2));
   EXPECT_EQ(QueuedType::OVER, window->queue_response_type());
 
   // At this point, we respond with no available drag actions at this pixel.
   window->Respond(false);
   EXPECT_EQ(ui::mojom::Cursor::NO_DROP, cursor());
 }
 
 TEST_F(DragControllerTest, ResopnseFromOtherWindowDoesntChangeCursor) {
   std::unique_ptr<DragTestWindow> window1 = BuildWindow();
   std::unique_ptr<DragTestWindow> window2 = BuildWindow();
-  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data;
-  StartDragOperation(std::move(mime_data), window1.get(),
-                     ui::mojom::kDropEffectMove);
+  StartDragOperation(window1.get(), ui::mojom::kDropEffectMove);
 
   // Send some events to |window2|.
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
   EXPECT_EQ(QueuedType::ENTER, window2->queue_response_type());
   DispatchDrag(window2.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(1, 1));
 
   EXPECT_EQ(ui::mojom::Cursor::NO_DROP, cursor());
 
   // Now enter |window1|, and respond.
   DispatchDrag(window1.get(), false, ui::EF_LEFT_MOUSE_BUTTON,
                gfx::Point(5, 5));
   EXPECT_EQ(QueuedType::ENTER, window1->queue_response_type());
   window1->Respond(true);
 
   EXPECT_EQ(ui::mojom::Cursor::COPY, cursor());
 
   // Window 2 responding negatively to its queued messages shouldn't change the
   // cursor.
   window2->Respond(false);
 
   EXPECT_EQ(ui::mojom::Cursor::COPY, cursor());
 }
 
 }  // namespace ws
 }  // namespace ui