Fix shelf alignment and auto-hide initialization.

ash/shelf/shelf_view_unittest.cc

 // Copyright (c) 2012 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_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 226 matching lines @@
   EXPECT_TRUE(observer()->icon_positions_changed());
   observer()->Reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfView tests.
 
 // A ShelfDelegate test double that will always convert between ShelfIDs and app
 // ids. This does not support pinning and unpinning operations and the return
 // value of IsAppPinned(...) is configurable.
-class TestShelfDelegateForShelfView : public ShelfDelegate {
+class TestShelfDelegateForShelfView : public TestShelfDelegate {
  public:
-  TestShelfDelegateForShelfView() {}
+  explicit TestShelfDelegateForShelfView(ShelfModel* model)
+      : TestShelfDelegate(model) {}
   ~TestShelfDelegateForShelfView() override {}
 
   void set_is_app_pinned(bool is_pinned) { is_app_pinned_ = is_pinned; }
 
   // ShelfDelegate overrides:
   ShelfID GetShelfIDForAppID(const std::string& app_id) override {
     ShelfID id = 0;
     EXPECT_TRUE(base::StringToInt(app_id, &id));
     return id;
   }
 
-  ShelfID GetShelfIDForAppIDAndLaunchID(const std::string& app_id,
-                                        const std::string& launch_id) override {
-    return GetShelfIDForAppID(app_id);
-  }
-
   bool HasShelfIDToAppIDMapping(ShelfID id) const override { return true; }
 
   const std::string& GetAppIDForShelfID(ShelfID id) override {
     // Use |app_id_| member variable because returning a reference to local
     // variable is not allowed.
     app_id_ = base::IntToString(id);
     return app_id_;
   }
 
   void PinAppWithID(const std::string& app_id) override { NOTREACHED(); }
@@ skipping 402 matching lines @@
     test_api_->HideOverflowBubble();
   }
 
   // Returns the item's ShelfID at |index|.
   ShelfID GetItemId(int index) {
     DCHECK_GE(index, 0);
     return model_->items()[index].id;
   }
 
   void ReplaceShelfDelegate() {
-    shelf_delegate_ = new TestShelfDelegateForShelfView();
+    // Clear the value first to avoid TestShelfDelegate's singleton check.
+    WmShell::Get()->SetShelfDelegateForTesting(nullptr);
+    shelf_delegate_ = new TestShelfDelegateForShelfView(model_);
     test_api_->SetShelfDelegate(shelf_delegate_);
     WmShell::Get()->SetShelfDelegateForTesting(
         base::WrapUnique(shelf_delegate_));
   }
 
   ShelfModel* model_;
   ShelfView* shelf_view_;
   int browser_index_;
 
   // Owned by ash::WmShell.
@@ skipping 32 matching lines @@
   bool is_rtl_;
   std::string original_locale_;
 };
 
 class ShelfViewTextDirectionTest : public ShelfViewTest,
                                    public testing::WithParamInterface<bool> {
  public:
   ShelfViewTextDirectionTest() : text_direction_change_(GetParam()) {}
   virtual ~ShelfViewTextDirectionTest() {}
 
-  void SetUp() override { ShelfViewTest::SetUp(); }
-
-  void TearDown() override { ShelfViewTest::TearDown(); }
-
  private:
   ScopedTextDirectionChange text_direction_change_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfViewTextDirectionTest);
 };
 
 // Checks that the ideal item icon bounds match the view's bounds in the screen
 // in both LTR and RTL.
 TEST_P(ShelfViewTextDirectionTest, IdealBoundsOfItemIcon) {
   ShelfID id = AddApp();
@@ skipping 2267 matching lines @@
   EXPECT_EQ(views::InkDropState::ACTIVATED,
             overflow_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
               IsEmpty());
 
   ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
 }
 
 }  // namespace test
 }  // namespace ash