Fix shelf alignment and auto-hide initialization.

ash/common/test/test_shelf_delegate.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/test/test_shelf_delegate.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shell_observer.h"
 #include "ash/common/test/test_shelf_item_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
+#include "ash/root_window_controller.h"
 #include "base/memory/ptr_util.h"
 
 namespace ash {
 namespace test {
 
 TestShelfDelegate* TestShelfDelegate::instance_ = nullptr;
 
+// A ShellObserver that sets the shelf alignment and auto hide behavior when the
+// shelf is created, to simulate ChromeLauncherController's behavior.
+class ShelfInitializer : public ShellObserver {
+ public:
+  ShelfInitializer() { WmShell::Get()->AddShellObserver(this); }
+  ~ShelfInitializer() override { WmShell::Get()->RemoveShellObserver(this); }
+
+  // ShellObserver:
+  void OnShelfCreatedForRootWindow(WmWindow* root_window) override {
+    WmShelf* shelf = root_window->GetRootWindowController()->GetShelf();
+    // Do not override the custom initialization performed by some unit tests.
+    if (shelf->alignment() == SHELF_ALIGNMENT_BOTTOM_LOCKED &&
+        shelf->auto_hide_behavior() == SHELF_AUTO_HIDE_ALWAYS_HIDDEN) {
+      shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
+      shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
+      shelf->UpdateVisibilityState();
+    }
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ShelfInitializer);
+};
+
 TestShelfDelegate::TestShelfDelegate(ShelfModel* model) : model_(model) {
   CHECK(!instance_);
   instance_ = this;
+  shelf_initializer_ = base::MakeUnique<ShelfInitializer>();

[James Cook, 2017/02/14 01:38:03]

Can this go in the initializer list? If not, comment why.

[msw, 2017/02/14 05:13:18]

Done.

 }
 
 TestShelfDelegate::~TestShelfDelegate() {
   instance_ = nullptr;
 }
 
 void TestShelfDelegate::AddShelfItem(WmWindow* window) {
   AddShelfItem(window, STATUS_CLOSED);
 }
 
@@ skipping 89 matching lines @@
                                                  const std::string& app_id) {
   shelf_id_to_app_id_map_[shelf_id] = app_id;
 }
 
 void TestShelfDelegate::RemoveShelfIDToAppIDMapping(ShelfID shelf_id) {
   shelf_id_to_app_id_map_.erase(shelf_id);
 }
 
 }  // namespace test
 }  // namespace ash