Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: chrome/browser/ui/cocoa/download/download_shelf_controller_unittest.mm

Issue 16018005: Use DownloadItem::GetState() in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Stopping complete_animation_ when download is cancelled Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #import "base/memory/scoped_nsobject.h" 7 #import "base/memory/scoped_nsobject.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/download/download_shelf.h" 9 #include "chrome/browser/download/download_shelf.h"
10 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 10 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 scoped_nsobject<CountingDownloadShelfController> shelf_; 113 scoped_nsobject<CountingDownloadShelfController> shelf_;
114 scoped_nsobject<ViewResizerPong> resize_delegate_; 114 scoped_nsobject<ViewResizerPong> resize_delegate_;
115 }; 115 };
116 116
117 id DownloadShelfControllerTest::CreateItemController() { 117 id DownloadShelfControllerTest::CreateItemController() {
118 scoped_ptr<content::MockDownloadItem> download( 118 scoped_ptr<content::MockDownloadItem> download(
119 new ::testing::NiceMock<content::MockDownloadItem>); 119 new ::testing::NiceMock<content::MockDownloadItem>);
120 ON_CALL(*download.get(), GetOpened()) 120 ON_CALL(*download.get(), GetOpened())
121 .WillByDefault(Return(false)); 121 .WillByDefault(Return(false));
122 ON_CALL(*download.get(), IsInProgress()) 122 ON_CALL(*download.get(), GetState())
123 .WillByDefault(Return(true)); 123 .WillByDefault(Return(content::DownloadItem::IN_PROGRESS));
124 124
125 scoped_nsobject<WrappedMockDownloadItem> wrappedMockDownload( 125 scoped_nsobject<WrappedMockDownloadItem> wrappedMockDownload(
126 [[WrappedMockDownloadItem alloc] initWithMockDownload:download.Pass()]); 126 [[WrappedMockDownloadItem alloc] initWithMockDownload:download.Pass()]);
127 127
128 id item_controller = 128 id item_controller =
129 [OCMockObject mockForClass:[DownloadItemController class]]; 129 [OCMockObject mockForClass:[DownloadItemController class]];
130 scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]); 130 scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
131 [[[item_controller stub] andCall:@selector(download) 131 [[[item_controller stub] andCall:@selector(download)
132 onObject:wrappedMockDownload.get()] download]; 132 onObject:wrappedMockDownload.get()] download];
133 [[item_controller stub] updateVisibility:[OCMArg any]]; 133 [[item_controller stub] updateVisibility:[OCMArg any]];
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 EXPECT_EQ(0, shelf_.get()->scheduleAutoCloseCount_); 354 EXPECT_EQ(0, shelf_.get()->scheduleAutoCloseCount_);
355 EXPECT_EQ(2, shelf_.get()->cancelAutoCloseCount_); 355 EXPECT_EQ(2, shelf_.get()->cancelAutoCloseCount_);
356 356
357 [shelf_ exiting]; 357 [shelf_ exiting];
358 EXPECT_EQ(0, shelf_.get()->scheduleAutoCloseCount_); 358 EXPECT_EQ(0, shelf_.get()->scheduleAutoCloseCount_);
359 EXPECT_EQ(3, shelf_.get()->cancelAutoCloseCount_); 359 EXPECT_EQ(3, shelf_.get()->cancelAutoCloseCount_);
360 shelf_.reset(); 360 shelf_.reset();
361 } 361 }
362 362
363 } // namespace 363 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/download/download_shelf_controller.mm ('k') | chrome/browser/ui/cocoa/download/download_util_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698