ash/mus: Store the InterfaceRequest<>s directly in the vector.

ash/mus/window_manager_application.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 "ash/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/mus/accelerator_registrar_impl.h"
 #include "ash/mus/root_window_controller.h"
@@ skipping 72 matching lines @@
   return true;
 }
 
 void WindowManagerApplication::Create(
     shell::Connection* connection,
     mojo::InterfaceRequest<mojom::ShelfLayout> request) {
   // TODO(msw): Handle multiple shelves (one per display).
   if (!window_manager_->GetRootWindowControllers().empty()) {
     shelf_layout_bindings_.AddBinding(shelf_layout_.get(), std::move(request));
   } else {
-    shelf_layout_requests_.push_back(base::WrapUnique(
-        new mojo::InterfaceRequest<mojom::ShelfLayout>(std::move(request))));
+    shelf_layout_requests_.push_back(std::move(request));
   }
 }
 
 void WindowManagerApplication::Create(
     shell::Connection* connection,
     mojo::InterfaceRequest<mojom::UserWindowController> request) {
   if (!window_manager_->GetRootWindowControllers().empty()) {
     user_window_controller_bindings_.AddBinding(user_window_controller_.get(),
                                                 std::move(request));
   } else {
-    user_window_controller_requests_.push_back(base::WrapUnique(
-        new mojo::InterfaceRequest<mojom::UserWindowController>(
-            std::move(request))));
+    user_window_controller_requests_.push_back(std::move(request));
   }
 }
 
 void WindowManagerApplication::Create(
     shell::Connection* connection,
     mojo::InterfaceRequest<::mus::mojom::AcceleratorRegistrar> request) {
   if (!window_manager_->window_manager_client())
     return;  // Can happen during shutdown.
 
   static int accelerator_registrar_count = 0;
@@ skipping 24 matching lines @@
   // be owned by WindowManager and/or RootWindowController. But this code is
   // temporary while migrating away from sysui.
 
   shelf_layout_.reset(new ShelfLayoutImpl);
   user_window_controller_.reset(new UserWindowControllerImpl());
 
   // TODO(msw): figure out if this should be per display, or global.
   user_window_controller_->Initialize(controller);
   for (auto& request : user_window_controller_requests_)
     user_window_controller_bindings_.AddBinding(user_window_controller_.get(),
-                                                std::move(*request));
+                                                std::move(request));
   user_window_controller_requests_.clear();
 
   // TODO(msw): figure out if this should be per display, or global.
   shelf_layout_->Initialize(controller);
   for (auto& request : shelf_layout_requests_)
-    shelf_layout_bindings_.AddBinding(shelf_layout_.get(), std::move(*request));
+    shelf_layout_bindings_.AddBinding(shelf_layout_.get(), std::move(request));
   shelf_layout_requests_.clear();
 }
 
 void WindowManagerApplication::OnWillDestroyRootWindowController(
     RootWindowController* controller) {
   // TODO(msw): this isn't right, ownership should belong in WindowManager
   // and/or RootWindowController. But this is temporary until we get rid of
   // sysui.
   shelf_layout_.reset();
   user_window_controller_.reset();
 }
 
 }  // namespace mus
 }  // namespace ash