Add ShelfWindowWatcher support for pre-existing windows.

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/shelf/shelf_item_types.h"
 #include "ash/common/shelf/shelf_model.h"
+#include "ash/common/test/test_session_state_delegate.h"

[James Cook, 2017/01/10 19:51:15]

nit: still needed?

[msw, 2017/01/10 20:06:30]

Changed to ash/common/session/session_state_delegate.h; thanks!

 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/base/hit_test.h"
@@ skipping 307 matching lines @@
   window->AddChild(child_window);
   child_window->Show();
   // |child_window| should not result in adding a new entry.
   EXPECT_EQ(initial_item_count + 1, model_->item_count());
 
   child_window->Destroy();
   window->Destroy();
   EXPECT_EQ(initial_item_count, model_->item_count());
 }
 
+// A ShelfWindowWatcherTest subclass that doesn't start a user session in SetUp.
+class ShelfWindowWatcherSessionStartTest : public ShelfWindowWatcherTest {

[James Cook, 2017/01/10 19:51:15]

For future reference there is also NoSessionAshTestBase

https://cs.chromium.org/chromium/src/ash/test/ash_test_base.h?type=cs&q=f:ash...

[msw, 2017/01/10 20:06:30]

I updated my test fixture to use that; thanks!

+ public:
+  ShelfWindowWatcherSessionStartTest() {
+    // Let the test fixture start running before starting the user session.
+    set_start_session(false);
+  }
+  ~ShelfWindowWatcherSessionStartTest() override {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherSessionStartTest);
+};
+
+// Ensures ShelfWindowWatcher supports windows opened prior to session start.
+TEST_F(ShelfWindowWatcherSessionStartTest, PreExistingWindow) {
+  ASSERT_FALSE(
+      WmShell::Get()->GetSessionStateDelegate()->IsActiveUserSessionStarted());
+
+  // ShelfModel only has an APP_LIST item.
+  EXPECT_EQ(1, model_->item_count());
+
+  // Construct a window that should get a shelf item once the session starts.
+  std::unique_ptr<views::Widget> widget =
+      CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
+  WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget.get());
+  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