Remove mojo::Array.

services/ui/ws/user_display_manager.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/user_display_manager.h"
 
 #include <utility>
 
 #include "services/ui/display/screen_manager.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/user_display_manager_delegate.h"
 #include "ui/display/types/display_constants.h"
 
 namespace ui {
 namespace ws {
+namespace {
+
+std::vector<mojom::WsDisplayPtr> CloneDisplays(
+    const std::vector<mojom::WsDisplayPtr>& input) {
+  std::vector<mojom::WsDisplayPtr> result;
+  result.reserve(input.size());
+  for (const auto& display : input) {
+    result.push_back(display.Clone());
+  }
+  return result;
+}
+
+}  // namespace
 
 UserDisplayManager::UserDisplayManager(ws::DisplayManager* display_manager,
                                        UserDisplayManagerDelegate* delegate,
                                        const UserId& user_id)
     : display_manager_(display_manager),
       delegate_(delegate),
       user_id_(user_id),
       got_valid_frame_decorations_(
           delegate->GetFrameDecorationsForUser(user_id, nullptr)),
       current_cursor_location_(0) {}
 
 UserDisplayManager::~UserDisplayManager() {}
 
 void UserDisplayManager::OnFrameDecorationValuesChanged() {
   if (!got_valid_frame_decorations_) {
     got_valid_frame_decorations_ = true;
     display_manager_observers_.ForAllPtrs([this](
         mojom::DisplayManagerObserver* observer) { CallOnDisplays(observer); });
     return;
   }
 
-  mojo::Array<mojom::WsDisplayPtr> displays = GetAllDisplays();
+  std::vector<mojom::WsDisplayPtr> displays = GetAllDisplays();
   display_manager_observers_.ForAllPtrs(
       [this, &displays](mojom::DisplayManagerObserver* observer) {
-        observer->OnDisplaysChanged(displays.Clone().PassStorage());
+        observer->OnDisplaysChanged(CloneDisplays(displays));
       });
 }
 
 void UserDisplayManager::AddDisplayManagerBinding(
     mojo::InterfaceRequest<mojom::DisplayManager> request) {
   display_manager_bindings_.AddBinding(this, std::move(request));
 }
 
 void UserDisplayManager::OnDisplayUpdate(Display* display) {
   if (!got_valid_frame_decorations_)
     return;
 
-  mojo::Array<mojom::WsDisplayPtr> displays(1);
+  std::vector<mojom::WsDisplayPtr> displays(1);
   displays[0] = GetWsDisplayPtr(*display);
 
   display_manager_observers_.ForAllPtrs(
       [&displays](mojom::DisplayManagerObserver* observer) {
-        observer->OnDisplaysChanged(displays.Clone().PassStorage());
+        observer->OnDisplaysChanged(CloneDisplays(displays));
       });
 }
 
 void UserDisplayManager::OnWillDestroyDisplay(Display* display) {
   if (!got_valid_frame_decorations_)
     return;
 
   display_manager_observers_.ForAllPtrs(
       [&display](mojom::DisplayManagerObserver* observer) {
         observer->OnDisplayRemoved(display->GetId());
@@ skipping 62 matching lines @@
 
 mojom::WsDisplayPtr UserDisplayManager::GetWsDisplayPtr(
     const Display& display) {
   mojom::WsDisplayPtr ws_display = mojom::WsDisplay::New();
   ws_display->display = display.ToDisplay();
   delegate_->GetFrameDecorationsForUser(user_id_,
                                         &ws_display->frame_decoration_values);
   return ws_display;
 }
 
-mojo::Array<mojom::WsDisplayPtr> UserDisplayManager::GetAllDisplays() {
+std::vector<mojom::WsDisplayPtr> UserDisplayManager::GetAllDisplays() {
   const auto& displays = display_manager_->displays();
-  mojo::Array<mojom::WsDisplayPtr> display_ptrs(displays.size());
+  std::vector<mojom::WsDisplayPtr> display_ptrs;
+  display_ptrs.reserve(displays.size());
 
-  size_t i = 0;
   // TODO(sky): need ordering!
   for (Display* display : displays) {
-    display_ptrs[i] = GetWsDisplayPtr(*display);
-    ++i;
+    display_ptrs.push_back(GetWsDisplayPtr(*display));
   }
 
   return display_ptrs;
 }
 
 void UserDisplayManager::CallOnDisplays(
     mojom::DisplayManagerObserver* observer) {
   // TODO(kylechar): Pass internal display id to clients here.
   observer->OnDisplays(
-      GetAllDisplays().PassStorage(),
+      GetAllDisplays(),
       display::ScreenManager::GetInstance()->GetPrimaryDisplayId(),
       display::kInvalidDisplayId);
 }
 
 }  // namespace ws
 }  // namespace ui