chromeos: moves more ash tests to run on mash

ash/wm/dock/docked_window_resizer_unittest.cc

 // Copyright (c) 2013 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/dock/docked_window_resizer.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/test/test_shelf_delegate.h"
@@ skipping 77 matching lines @@
     window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_SYSTEM);
     window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window->Init(ui::LAYER_TEXTURED);
     window->Show();
 
     if (bounds.IsEmpty()) {
       ParentWindowInPrimaryRootWindow(window);
     } else {
       display::Display display =
           display::Screen::GetScreen()->GetDisplayMatching(bounds);
-      aura::Window* root = ash::Shell::GetInstance()
-                               ->window_tree_host_manager()
-                               ->GetRootWindowForDisplayId(display.id());
+      WmWindow* root = WmShell::Get()->GetRootWindowForDisplayId(display.id());
       gfx::Point origin = bounds.origin();
-      ::wm::ConvertPointFromScreen(root, &origin);
+      ::wm::ConvertPointFromScreen(root->aura_window(), &origin);
       window->SetBounds(gfx::Rect(origin, bounds.size()));
-      aura::client::ParentWindowWithContext(window, root, bounds);
+      aura::client::ParentWindowWithContext(window, root->aura_window(),
+                                            bounds);
     }
     return window;
   }
 
   static WindowResizer* CreateSomeWindowResizer(
       aura::Window* window,
       const gfx::Point& point_in_parent,
       int window_component) {
     return CreateWindowResizer(WmWindow::Get(window), point_in_parent,
                                window_component,
@@ skipping 531 matching lines @@
   DragMove(-10, 10);
   DragRevert();
   // The window should be in default container and not docked.
   EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
   // Docked area alignment should be cleared.
   EXPECT_EQ(DOCKED_ALIGNMENT_NONE, docked_alignment(manager));
 }
 
 // Move a docked window to the second display
 TEST_P(DockedWindowResizerTest, DragAcrossDisplays) {
+  // TODO: investigate failure in mash. http://crbug.com/698060.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   UpdateDisplay("800x800,800x800");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ(2, static_cast<int>(root_windows.size()));
   std::unique_ptr<aura::Window> window(
       CreateTestWindow(gfx::Rect(0, 0, 201, 201)));
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
 
   DragRelativeToEdge(DOCKED_EDGE_RIGHT, window.get(), 0);
   // The window should be docked at the right edge.
   EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(),
@@ skipping 645 matching lines @@
     EXPECT_TRUE(w1->GetProperty(kPanelAttachedKey));
   } else {
     // The window should not be touching the shelf.
     EXPECT_EQ(shelf_y - kDistanceFromShelf, w1->bounds().bottom());
   }
 }
 
 // Tests that docking and undocking a |window| with a transient child properly
 // maintains the parent of that transient child to be the same as the |window|.
 TEST_P(DockedWindowResizerTest, DragWindowWithTransientChild) {
+  // TODO: investigate failure in mash. http://crbug.com/698060.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   // Create a window with a transient child.
   std::unique_ptr<aura::Window> window(
       CreateTestWindow(gfx::Rect(0, 0, 201, 201)));
   std::unique_ptr<aura::Window> child(
       CreateTestWindowInShellWithDelegateAndType(
           NULL, ui::wm::WINDOW_TYPE_NORMAL, 0, gfx::Rect(20, 20, 150, 20)));
   ::wm::AddTransientChild(window.get(), child.get());
   if (window->parent() != child->parent())
     window->parent()->AddChild(child.get());
   EXPECT_EQ(window.get(), ::wm::GetTransientParent(child.get()));
@@ skipping 161 matching lines @@
   EXPECT_TRUE(window_state->IsMaximized());
 }
 
 // Tests run twice - on both panels and normal windows
 INSTANTIATE_TEST_CASE_P(NormalOrPanel,
                         DockedWindowResizerTest,
                         testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
                                         ui::wm::WINDOW_TYPE_PANEL));
 
 }  // namespace ash