diff options
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm b/chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm index 158069b..f260903 100644 --- a/chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm +++ b/chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm @@ -32,15 +32,11 @@ typedef std::pair<GURL,WindowOpenDisposition> OpenInfo; @implementation FakeBookmarkBarController -- (id)initWithProfile:(Profile*)profile - parentView:(NSView*)parentView - webContentView:(NSView*)webContentView - infoBarsView:(NSView*)infoBarsView { +- (id)initWithProfile:(Profile*)profile { if ((self = [super initWithProfile:profile - parentView:parentView - webContentView:webContentView - infoBarsView:infoBarsView - delegate:self])) { + initialWidth:100 // arbitrary + resizeDelegate:nil + urlDelegate:self])) { callbacks_.reset([[NSMutableArray alloc] init]); } return self; @@ -96,14 +92,8 @@ typedef std::pair<GURL,WindowOpenDisposition> OpenInfo; class BookmarkBarBridgeTest : public testing::Test { public: - BookmarkBarBridgeTest() { - NSRect content_frame = NSMakeRect(0, 0, 100, 100); - view_.reset([[NSView alloc] initWithFrame:content_frame]); - } - CocoaTestHelper cocoa_helper_; BrowserTestHelper browser_test_helper_; - scoped_nsobject<NSView> view_; }; // Call all the callbacks; make sure they are all redirected to the objc object. @@ -119,11 +109,7 @@ TEST_F(BookmarkBarBridgeTest, TestRedirect) { [[NSView alloc] initWithFrame:NSMakeRect(0,0,100,100)]); scoped_nsobject<FakeBookmarkBarController> - controller([[FakeBookmarkBarController alloc] - initWithProfile:profile - parentView:parentView.get() - webContentView:webView.get() - infoBarsView:infoBarsView.get()]); + controller([[FakeBookmarkBarController alloc] initWithProfile:profile]); EXPECT_TRUE(controller.get()); scoped_ptr<BookmarkBarBridge> bridge(new BookmarkBarBridge(controller.get(), model)); |