Download shelf autohides on showing in shell, just same as regular open

chrome/browser/ui/cocoa/download/download_shelf_controller_unittest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 #include <utility>
 
 #import "base/mac/scoped_block.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/run_loop.h"
+#include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/download/download_item_controller.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
 #include "content/public/test/mock_download_item.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #import "third_party/ocmock/gtest_support.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
@@ skipping 220 matching lines @@
   EXPECT_EQ(2, shelf_.get()->cancelAutoCloseCount_);
   shelf_.get()->cancelAutoCloseCount_ = 0;
 
   // The mouse enters the shelf.
   [shelf_ mouseEntered:cocoa_test_event_utils::EnterEvent()];
   EXPECT_EQ(0, shelf_.get()->scheduleAutoCloseCount_);
 
   // The download opens.
   EXPECT_CALL(*[[item wrappedMockDownload] mockDownload], GetOpened())
       .WillRepeatedly(Return(true));
-  [shelf_ downloadWasOpened:item.get()];
+  [shelf_ downloadWasOpenedOrShown:item.get()];
 
   // The shelf should now be waiting for the mouse to exit.
   EXPECT_TRUE([shelf_ isVisible]);
   EXPECT_EQ(0, shelf_.get()->scheduleAutoCloseCount_);
   EXPECT_EQ(0, shelf_.get()->cancelAutoCloseCount_);
 
   // The mouse exits the shelf. autoClose should be scheduled now.
   [shelf_ mouseExited:cocoa_test_event_utils::ExitEvent()];
   EXPECT_EQ(1, shelf_.get()->scheduleAutoCloseCount_);
   EXPECT_EQ(0, shelf_.get()->cancelAutoCloseCount_);
 
   // The mouse enters the shelf again. The autoClose should be cancelled.
   [shelf_ mouseEntered:cocoa_test_event_utils::EnterEvent()];
   EXPECT_EQ(1, shelf_.get()->scheduleAutoCloseCount_);
   EXPECT_EQ(1, shelf_.get()->cancelAutoCloseCount_);
 }
 
 // Test of autoclosing behavior after opening a download item.
 TEST_F(DownloadShelfControllerTest, AutoCloseAfterOpenWithMouseOffShelf) {
   base::scoped_nsobject<DownloadItemController> item(CreateItemController());
   [shelf_ showDownloadShelf:YES
                isUserAction:NO];
   EXPECT_TRUE([shelf_ isVisible]);
   [shelf_ add:item.get()];
 
   // The download is opened.
   EXPECT_CALL(*[[item wrappedMockDownload] mockDownload], GetOpened())
       .WillRepeatedly(Return(true));
-  [shelf_ downloadWasOpened:item.get()];
+  [shelf_ downloadWasOpenedOrShown:item.get()];
 
   // The shelf should be closed immediately since the mouse is not over the
   // shelf.
   EXPECT_FALSE([shelf_ isVisible]);
 }
 
 // Test that if the shelf is closed while an autoClose is pending, the pending
 // autoClose is cancelled.
 TEST_F(DownloadShelfControllerTest, CloseWithPendingAutoClose) {
   base::scoped_nsobject<DownloadItemController> item(CreateItemController());
   [shelf_ showDownloadShelf:YES
                isUserAction:NO];
   EXPECT_TRUE([shelf_ isVisible]);
   [shelf_ add:item.get()];
   // Expect 2 cancelAutoClose calls: From the showDownloadShelf: call and the
   // add: call.
   EXPECT_EQ(2, shelf_.get()->cancelAutoCloseCount_);
   shelf_.get()->cancelAutoCloseCount_ = 0;
 
   // The mouse enters the shelf.
   [shelf_ mouseEntered:cocoa_test_event_utils::EnterEvent()];
   EXPECT_EQ(0, shelf_.get()->scheduleAutoCloseCount_);
 
   // The download opens.
   EXPECT_CALL(*[[item wrappedMockDownload] mockDownload], GetOpened())
       .WillRepeatedly(Return(true));
-  [shelf_ downloadWasOpened:item.get()];
+  [shelf_ downloadWasOpenedOrShown:item.get()];
 
   // The shelf should now be waiting for the mouse to exit. autoClose should not
   // be scheduled yet.
   EXPECT_TRUE([shelf_ isVisible]);
   EXPECT_EQ(0, shelf_.get()->scheduleAutoCloseCount_);
   EXPECT_EQ(0, shelf_.get()->cancelAutoCloseCount_);
 
   // The mouse exits the shelf. autoClose should be scheduled now.
   [shelf_ mouseExited:cocoa_test_event_utils::ExitEvent()];
   EXPECT_EQ(1, shelf_.get()->scheduleAutoCloseCount_);
@@ skipping 20 matching lines @@
   EXPECT_EQ(2, shelf_.get()->cancelAutoCloseCount_);
   shelf_.get()->cancelAutoCloseCount_ = 0;
 
   // The mouse enters the shelf.
   [shelf_ mouseEntered:cocoa_test_event_utils::EnterEvent()];
   EXPECT_EQ(0, shelf_.get()->scheduleAutoCloseCount_);
 
   // The download opens.
   EXPECT_CALL(*[[item wrappedMockDownload] mockDownload], GetOpened())
       .WillRepeatedly(Return(true));
-  [shelf_ downloadWasOpened:item.get()];
+  [shelf_ downloadWasOpenedOrShown:item.get()];
 
   // The shelf should now be waiting for the mouse to exit. autoClose should not
   // be scheduled yet.
   EXPECT_TRUE([shelf_ isVisible]);
   EXPECT_EQ(0, shelf_.get()->scheduleAutoCloseCount_);
   EXPECT_EQ(0, shelf_.get()->cancelAutoCloseCount_);
 
   // The mouse exits the shelf. autoClose should be scheduled now.
   [shelf_ mouseExited:cocoa_test_event_utils::ExitEvent()];
   EXPECT_EQ(1, shelf_.get()->scheduleAutoCloseCount_);
@@ skipping 37 matching lines @@
   }];
   [shelf_ showDownloadShelf:NO isUserAction:NO];
   run_loop.Run();
   EXPECT_TRUE([[shelf_ view] isHidden]);
 
   [shelf_ showDownloadShelf:YES isUserAction:NO];
   EXPECT_FALSE([[shelf_ view] isHidden]);
 }
 
 }  // namespace