Remove docked windows entirely in M59.

ash/common/shelf/shelf_window_watcher_unittest.cc

 // Copyright 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/shelf/shelf_window_watcher.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/wm/window_resizer.h"
@@ skipping 201 matching lines @@
   window_state->Restore();
   EXPECT_FALSE(window_state->IsMaximized());
   // No new item is created after restoring a window |window|.
   EXPECT_EQ(2, model_->item_count());
   // Index and id are not changed after maximizing a window |window|.
   EXPECT_EQ(index, model_->ItemIndexByID(id));
   EXPECT_EQ(id, model_->items()[index].id);
 }
 
 // Check that an item is maintained when its associated Window is docked.
 TEST_F(ShelfWindowWatcherTest, DockWindow) {

[varkha, 2017/02/28 00:59:02]

Do we still need this test?

[afakhry, 2017/03/09 22:28:26]

Nope. Removed.

   // 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 = WmLookup::Get()->GetWindowForWidget(widget.get());
 
   // 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) {
   // TODO: investigate failure in mash. http://crbug.com/695562.
@@ skipping 114 matching lines @@
   WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget.get());
   ShelfWindowWatcherTest::CreateShelfItem(window);
   EXPECT_EQ(1, model->item_count());
 
   // Start the test user session; ShelfWindowWatcher will find the open window.
   SetSessionStarted(true);
   EXPECT_EQ(2, model->item_count());
 }
 
 }  // namespace ash