Fix shelf auto-hide calculation for app-list visibility.

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 2026 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ListMenuShelfItemDelegate);
 };
 
 // A test implementation for AppListPresenter that does not change visibility
 // state immediately to simulate an in-flight animation. Calling
 // FinishVisibilityChange() will change the visibility to the requested one,
 // simulating end of the animation. Similar to the actual AppListPresenter, this
 // class toggles app list visibility based on the actual visibility rather than
 // the target visibility (which might be different due to in-flight animation).
+// This test class doesn't support checking for display-specific visibility.
 class TestAppListPresenter : public app_list::AppListPresenter {
  public:
   TestAppListPresenter() {}
   ~TestAppListPresenter() override {}
 
   void FinishVisibilityChange() { is_visible_ = target_visibility_; }
 
   // app_list::AppListPresenter:
   void Show(int64_t display_id) override { target_visibility_ = true; }
   void Dismiss() override { target_visibility_ = false; }
   void ToggleAppList(int64_t display_id) override {
     if (is_visible_)
       Dismiss();
     else
       Show(display_id);
   }
-  bool IsVisible() const override { return is_visible_; }
-  bool GetTargetVisibility() const override { return target_visibility_; }
+  bool IsVisible(
+      int64_t display_id = display::kInvalidDisplayId) const override {
+    return is_visible_;
+  }
+  bool GetTargetVisibility(
+      int64_t display_id = display::kInvalidDisplayId) const override {
+    return target_visibility_;
+  }
 
  private:
   bool is_visible_ = false;
   bool target_visibility_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(TestAppListPresenter);
 };
 
 // A test ShellDelegate implementation that returns a TestAppListPresenter as
 // the app list presenter.
@@ skipping 1039 matching lines @@
   EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
               IsEmpty());
 
   ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
 }
 
 #endif  // !defined(OS_WIN)
 
 }  // namespace test
 }  // namespace ash