Renames WmWindowUserData and converts to using aura

ash/common/wm/container_finder.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 "ash/common/wm/container_finder.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
+#include "ui/aura/window.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 namespace wm {
 namespace {
 
 WmWindow* FindContainerRoot(const gfx::Rect& bounds) {
   if (bounds == gfx::Rect())
     return Shell::GetWmRootWindowForNewWindows();
   return GetRootWindowMatching(bounds);
@@ skipping 76 matching lines @@
       return target_root->GetChildByShellWindowId(
           kShellWindowId_DragImageAndTooltipContainer);
     default:
       NOTREACHED() << "Window " << window->GetShellWindowId()
                    << " has unhandled type " << window->GetType();
       break;
   }
   return nullptr;
 }
 
-std::vector<WmWindow*> GetContainersFromAllRootWindows(
+aura::Window::Windows GetContainersFromAllRootWindows(
     int container_id,
-    WmWindow* priority_root) {
-  std::vector<WmWindow*> containers;
-  for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
-    WmWindow* container = root->GetChildByShellWindowId(container_id);
+    aura::Window* priority_root) {
+  aura::Window::Windows containers;
+  for (aura::Window* root : Shell::GetAllRootWindows()) {
+    aura::Window* container = root->GetChildById(container_id);
     if (!container)
       continue;
 
     if (priority_root && priority_root->Contains(container))
       containers.insert(containers.begin(), container);
     else
       containers.push_back(container);
   }
   return containers;
 }
 
 }  // namespace wm
 }  // namespace ash