Remove docked windows entirely in M59.

ash/common/shelf/shelf_window_watcher_unittest.cc

Index: ash/common/shelf/shelf_window_watcher_unittest.cc
diff --git a/ash/common/shelf/shelf_window_watcher_unittest.cc b/ash/common/shelf/shelf_window_watcher_unittest.cc
index d43accaef4401247df91be9ea8ce9812cf7de811..cc9eb9de2865a9908e0c8ac815b85e9e8b06090f 100644
--- a/ash/common/shelf/shelf_window_watcher_unittest.cc
+++ b/ash/common/shelf/shelf_window_watcher_unittest.cc
@@ -225,45 +225,6 @@ TEST_F(ShelfWindowWatcherTest, MaximizeAndRestoreWindow) {
   EXPECT_EQ(id, model_->items()[index].id);
 }
 
-// Check that an item is maintained when its associated Window is docked.
-TEST_F(ShelfWindowWatcherTest, DockWindow) {
-  // TODO: investigate failure in mash. http://crbug.com/695562.
-  if (WmShell::Get()->IsRunningInMash())
-    return;
-
-  // ShelfModel only has an APP_LIST item.
-  EXPECT_EQ(1, model_->item_count());
-
-  std::unique_ptr<views::Widget> widget =
-      CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
-  WmWindow* window = WmWindow::Get(widget->GetNativeWindow());
-
-  // Create a ShelfItem for |window|.
-  ShelfID id = CreateShelfItem(window);
-  EXPECT_EQ(2, model_->item_count());
-
-  int index = model_->ItemIndexByID(id);
-  EXPECT_EQ(STATUS_ACTIVE, model_->items()[index].status);
-
-  WmWindow* root_window = window->GetRootWindow();
-  WmWindow* default_container =
-      root_window->GetChildByShellWindowId(kShellWindowId_DefaultContainer);
-  EXPECT_EQ(default_container, window->GetParent());
-
-  WmWindow* docked_container =
-      root_window->GetChildByShellWindowId(kShellWindowId_DockedContainer);
-
-  // Check |window|'s item is not removed when it is re-parented to the dock.
-  docked_container->AddChild(window);
-  EXPECT_EQ(docked_container, window->GetParent());
-  EXPECT_EQ(2, model_->item_count());
-
-  // The shelf item is removed when the window is closed, even if it is in the
-  // docked container at the time.
-  widget.reset();
-  EXPECT_EQ(1, model_->item_count());
-}
-
 // Check |window|'s item is not changed during the dragging.
 // TODO(simonhong): Add a test for removing a Window during the dragging.
 TEST_F(ShelfWindowWatcherTest, DragWindow) {