| Index: chrome/browser/ui/browser_browsertest.cc
|
| diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
|
| index b256df24586da312f70c416db57d5a53a2108660..ca23f7d2e2c1ceb8f6c43ff948e350b177e162fc 100644
|
| --- a/chrome/browser/ui/browser_browsertest.cc
|
| +++ b/chrome/browser/ui/browser_browsertest.cc
|
| @@ -1372,8 +1372,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) {
|
| EXPECT_TRUE(new_model->IsTabPinned(1));
|
| EXPECT_FALSE(new_model->IsTabPinned(2));
|
|
|
| - EXPECT_TRUE(chrome::IsNTPURL(new_model->GetWebContentsAt(2)->GetURL(),
|
| - browser()->profile()));
|
| + EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
|
| + new_model->GetWebContentsAt(2)->GetURL());
|
|
|
| EXPECT_TRUE(
|
| extensions::TabHelper::FromWebContents(
|
| @@ -2454,15 +2454,16 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) {
|
| RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
|
| }
|
|
|
| -// TODO(sail): enable this for MAC when
|
| -// BrowserWindowCocoa::GetRenderViewHeightInsetWithDetachedBookmarkBar
|
| -// is fixed.
|
| -#if defined(OS_MACOSX)
|
| -#define MAYBE_GetSizeForNewRenderView DISABLED_GetSizeForNewRenderView
|
| -#else
|
| -#define MAYBE_GetSizeForNewRenderView GetSizeForNewRenderView
|
| -#endif
|
| -IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_GetSizeForNewRenderView) {
|
| +// Does not work with Instant Extended. http://crbug.com/317760.
|
| +// // TODO(sail): enable this for MAC when
|
| +// // BrowserWindowCocoa::GetRenderViewHeightInsetWithDetachedBookmarkBar
|
| +// // is fixed.
|
| +// #if defined(OS_MACOSX)
|
| +// #define MAYBE_GetSizeForNewRenderView DISABLED_GetSizeForNewRenderView
|
| +// #else
|
| +// #define MAYBE_GetSizeForNewRenderView GetSizeForNewRenderView
|
| +// #endif
|
| +IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_GetSizeForNewRenderView) {
|
| ASSERT_TRUE(test_server()->Start());
|
| // Create an HTTPS server for cross-site transition.
|
| net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS,
|
|
|