| Index: chrome/browser/cocoa/tabpose_window_unittest.mm
|
| diff --git a/chrome/browser/cocoa/tabpose_window_unittest.mm b/chrome/browser/cocoa/tabpose_window_unittest.mm
|
| index 8f6f239cd1c5cf0d558e025da863bd0aa0e8db5e..ad102502d83d863b351c8069494f051ab6f81e0c 100644
|
| --- a/chrome/browser/cocoa/tabpose_window_unittest.mm
|
| +++ b/chrome/browser/cocoa/tabpose_window_unittest.mm
|
| @@ -4,9 +4,11 @@
|
|
|
| #import "chrome/browser/cocoa/tabpose_window.h"
|
|
|
| -#include "base/scoped_nsobject.h"
|
| +#import "chrome/browser/browser_window.h"
|
| #import "chrome/browser/cocoa/browser_test_helper.h"
|
| #import "chrome/browser/cocoa/cocoa_test_helper.h"
|
| +#include "chrome/browser/renderer_host/site_instance.h"
|
| +#include "chrome/browser/tab_contents/tab_contents.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| class TabposeWindowTest : public CocoaTest {
|
| @@ -16,20 +18,33 @@ class TabposeWindowTest : public CocoaTest {
|
|
|
| // Check that this doesn't leak.
|
| TEST_F(TabposeWindowTest, TestShow) {
|
| - scoped_nsobject<NSWindow> parent([[NSWindow alloc]
|
| - initWithContentRect:NSMakeRect(100, 200, 300, 200)
|
| - styleMask:NSTitledWindowMask
|
| - backing:NSBackingStoreBuffered
|
| - defer:NO]);
|
| + Browser* browser = browser_helper_.browser();
|
| + BrowserWindow* browser_window = browser_helper_.CreateBrowserWindow();
|
| + NSWindow* parent = browser_window->GetNativeHandle();
|
| +
|
| [parent orderFront:nil];
|
| EXPECT_TRUE([parent isVisible]);
|
|
|
| + // Add a few tabs to the tab strip model.
|
| + TabStripModel* model = browser->tabstrip_model();
|
| + SiteInstance* instance =
|
| + SiteInstance::CreateSiteInstance(browser_helper_.profile());
|
| + for (int i = 0; i < 3; ++i) {
|
| + TabContents* tab_contents =
|
| + new TabContents(browser_helper_.profile(), instance, MSG_ROUTING_NONE,
|
| + NULL);
|
| + model->AppendTabContents(tab_contents, /*foreground=*/true);
|
| + }
|
| +
|
| base::ScopedNSAutoreleasePool pool;
|
| TabposeWindow* window =
|
| - [TabposeWindow openTabposeFor:parent.get()
|
| - rect:NSMakeRect(10, 20, 50, 60)
|
| - slomo:NO];
|
| + [TabposeWindow openTabposeFor:parent
|
| + rect:NSMakeRect(10, 20, 250, 160)
|
| + slomo:NO
|
| + tabStripModel:model];
|
|
|
| // Should release the window.
|
| [window mouseDown:nil];
|
| +
|
| + browser_helper_.CloseBrowserWindow();
|
| }
|
|
|