| Index: chrome/browser/ui/cocoa/download/download_shelf_controller_unittest.mm
|
| diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller_unittest.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller_unittest.mm
|
| index c4b4e218fed5c4c74ed9b1e51061c4f4ed5905ef..2b5460d1518eb4ff9fc0d8f57d07fe250f212171 100644
|
| --- a/chrome/browser/ui/cocoa/download/download_shelf_controller_unittest.mm
|
| +++ b/chrome/browser/ui/cocoa/download/download_shelf_controller_unittest.mm
|
| @@ -171,8 +171,7 @@ TEST_VIEW(DownloadShelfControllerTest, [shelf_ view]);
|
| // immediately.
|
| TEST_F(DownloadShelfControllerTest, AddAndRemoveDownload) {
|
| base::scoped_nsobject<DownloadItemController> item(CreateItemController());
|
| - [shelf_ showDownloadShelf:YES
|
| - isUserAction:NO];
|
| + [shelf_ showDownloadShelf:YES isUserAction:NO animate:NO];
|
| EXPECT_TRUE([shelf_ isVisible]);
|
| EXPECT_TRUE([shelf_ bridge]->IsShowing());
|
| [shelf_ add:item];
|
| @@ -188,8 +187,7 @@ TEST_F(DownloadShelfControllerTest, AddAndRemoveDownload) {
|
| TEST_F(DownloadShelfControllerTest, AddAndRemoveWithActiveItem) {
|
| base::scoped_nsobject<DownloadItemController> item1(CreateItemController());
|
| base::scoped_nsobject<DownloadItemController> item2(CreateItemController());
|
| - [shelf_ showDownloadShelf:YES
|
| - isUserAction:NO];
|
| + [shelf_ showDownloadShelf:YES isUserAction:NO animate:NO];
|
| EXPECT_TRUE([shelf_ isVisible]);
|
| [shelf_ add:item1.get()];
|
| [shelf_ add:item2.get()];
|
| @@ -204,8 +202,7 @@ TEST_F(DownloadShelfControllerTest, AddAndRemoveWithActiveItem) {
|
| // active downloads on it.
|
| TEST_F(DownloadShelfControllerTest, HideAndUnhide) {
|
| base::scoped_nsobject<DownloadItemController> item(CreateItemController());
|
| - [shelf_ showDownloadShelf:YES
|
| - isUserAction:NO];
|
| + [shelf_ showDownloadShelf:YES isUserAction:NO animate:NO];
|
| EXPECT_TRUE([shelf_ isVisible]);
|
| [shelf_ add:item.get()];
|
| [shelf_ bridge]->Hide();
|
| @@ -220,8 +217,7 @@ TEST_F(DownloadShelfControllerTest, HideAndUnhide) {
|
| // active downloads are removed from the shelf while the shelf was hidden.
|
| TEST_F(DownloadShelfControllerTest, HideAutocloseUnhide) {
|
| base::scoped_nsobject<DownloadItemController> item(CreateItemController());
|
| - [shelf_ showDownloadShelf:YES
|
| - isUserAction:NO];
|
| + [shelf_ showDownloadShelf:YES isUserAction:NO animate:NO];
|
| EXPECT_TRUE([shelf_ isVisible]);
|
| [shelf_ add:item.get()];
|
| [shelf_ bridge]->Hide();
|
| @@ -236,8 +232,7 @@ TEST_F(DownloadShelfControllerTest, HideAutocloseUnhide) {
|
| // the download shelf at the time the autoclose is scheduled.
|
| TEST_F(DownloadShelfControllerTest, AutoCloseAfterOpenWithMouseInShelf) {
|
| base::scoped_nsobject<DownloadItemController> item(CreateItemController());
|
| - [shelf_ showDownloadShelf:YES
|
| - isUserAction:NO];
|
| + [shelf_ showDownloadShelf:YES isUserAction:NO animate:NO];
|
| EXPECT_TRUE([shelf_ isVisible]);
|
| [shelf_ add:item.get()];
|
| // Expect 2 cancelAutoClose calls: From the showDownloadShelf: call and the
|
| @@ -273,8 +268,7 @@ TEST_F(DownloadShelfControllerTest, AutoCloseAfterOpenWithMouseInShelf) {
|
| // Test of autoclosing behavior after opening a download item.
|
| TEST_F(DownloadShelfControllerTest, AutoCloseAfterOpenWithMouseOffShelf) {
|
| base::scoped_nsobject<DownloadItemController> item(CreateItemController());
|
| - [shelf_ showDownloadShelf:YES
|
| - isUserAction:NO];
|
| + [shelf_ showDownloadShelf:YES isUserAction:NO animate:NO];
|
| EXPECT_TRUE([shelf_ isVisible]);
|
| [shelf_ add:item.get()];
|
|
|
| @@ -292,8 +286,7 @@ TEST_F(DownloadShelfControllerTest, AutoCloseAfterOpenWithMouseOffShelf) {
|
| // autoClose is cancelled.
|
| TEST_F(DownloadShelfControllerTest, CloseWithPendingAutoClose) {
|
| base::scoped_nsobject<DownloadItemController> item(CreateItemController());
|
| - [shelf_ showDownloadShelf:YES
|
| - isUserAction:NO];
|
| + [shelf_ showDownloadShelf:YES isUserAction:NO animate:NO];
|
| EXPECT_TRUE([shelf_ isVisible]);
|
| [shelf_ add:item.get()];
|
| // Expect 2 cancelAutoClose calls: From the showDownloadShelf: call and the
|
| @@ -333,8 +326,7 @@ TEST_F(DownloadShelfControllerTest, CloseWithPendingAutoClose) {
|
| // added to it.
|
| TEST_F(DownloadShelfControllerTest, AddItemWithPendingAutoClose) {
|
| base::scoped_nsobject<DownloadItemController> item(CreateItemController());
|
| - [shelf_ showDownloadShelf:YES
|
| - isUserAction:NO];
|
| + [shelf_ showDownloadShelf:YES isUserAction:NO animate:NO];
|
| EXPECT_TRUE([shelf_ isVisible]);
|
| [shelf_ add:item.get()];
|
| // Expect 2 cancelAutoClose calls: From the showDownloadShelf: call and the
|
| @@ -373,8 +365,7 @@ TEST_F(DownloadShelfControllerTest, AddItemWithPendingAutoClose) {
|
| // Test that pending autoClose calls are cancelled when exiting.
|
| TEST_F(DownloadShelfControllerTest, CancelAutoCloseOnExit) {
|
| base::scoped_nsobject<DownloadItemController> item(CreateItemController());
|
| - [shelf_ showDownloadShelf:YES
|
| - isUserAction:NO];
|
| + [shelf_ showDownloadShelf:YES isUserAction:NO animate:NO];
|
| EXPECT_TRUE([shelf_ isVisible]);
|
| [shelf_ add:item.get()];
|
| EXPECT_EQ(0, shelf_.get()->scheduleAutoCloseCount_);
|
| @@ -390,7 +381,7 @@ TEST_F(DownloadShelfControllerTest, CancelAutoCloseOnExit) {
|
| // The view should be hidden after the closing animation.
|
| // Failing flakily on Mac 10.9, see: crbug.com/687447.
|
| TEST_F(DownloadShelfControllerTest, DISABLED_ViewVisibility) {
|
| - [shelf_ showDownloadShelf:YES isUserAction:NO];
|
| + [shelf_ showDownloadShelf:YES isUserAction:NO animate:NO];
|
| EXPECT_FALSE([[shelf_ view] isHidden]);
|
|
|
| base::RunLoop run_loop;
|
| @@ -399,11 +390,11 @@ TEST_F(DownloadShelfControllerTest, DISABLED_ViewVisibility) {
|
| [shelf_ setCloseAnimationHandler:^{
|
| run_loop_ptr->Quit();
|
| }];
|
| - [shelf_ showDownloadShelf:NO isUserAction:NO];
|
| + [shelf_ showDownloadShelf:NO isUserAction:NO animate:NO];
|
| run_loop.Run();
|
| EXPECT_TRUE([[shelf_ view] isHidden]);
|
|
|
| - [shelf_ showDownloadShelf:YES isUserAction:NO];
|
| + [shelf_ showDownloadShelf:YES isUserAction:NO animate:NO];
|
| EXPECT_FALSE([[shelf_ view] isHidden]);
|
| }
|
|
|
|
|