| Index: chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm
|
| ===================================================================
|
| --- chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm (revision 22499)
|
| +++ chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm (working copy)
|
| @@ -32,15 +32,11 @@
|
|
|
| @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 @@
|
|
|
| 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 @@
|
| [[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));
|
|
|