| Index: content/browser/web_contents/web_contents_impl_browsertest.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc
|
| index 3949928568b35b8b142921f4d88f808118d3a685..18bae1bb0c5752a85190d1946df02cf5652a6686 100644
|
| --- a/content/browser/web_contents/web_contents_impl_browsertest.cc
|
| +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc
|
| @@ -33,7 +33,7 @@ void ResizeWebContentsView(Shell* shell, const gfx::Size& size,
|
| // window on Linux because if we don't, the next layout of the unchanged shell
|
| // window will resize WebContentsView back to the previous size.
|
| // SizeContents is a hack and should not be relied on.
|
| -#if defined(TOOLKIT_GTK) || defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX)
|
| shell->SizeTo(size);
|
| // If |set_start_page| is true, start with blank page to make sure resize
|
| // takes effect.
|
| @@ -41,7 +41,7 @@ void ResizeWebContentsView(Shell* shell, const gfx::Size& size,
|
| NavigateToURL(shell, GURL("about://blank"));
|
| #else
|
| shell->web_contents()->GetView()->SizeContents(size);
|
| -#endif // defined(TOOLKIT_GTK) || defined(OS_MACOSX)
|
| +#endif // defined(OS_MACOSX)
|
| }
|
|
|
| class WebContentsImplBrowserTest : public ContentBrowserTest {
|
| @@ -258,9 +258,8 @@ IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
|
|
|
| // TODO(shrikant): enable this for Windows when issue with
|
| // force-compositing-mode is resolved (http://crbug.com/281726).
|
| -// For TOOLKIT_GTK failure, see http://crbug.com/351234.
|
| // Also crashes under ThreadSanitizer, http://crbug.com/356758.
|
| -#if defined(OS_WIN) || defined(OS_ANDROID) || defined(TOOLKIT_GTK) \
|
| +#if defined(OS_WIN) || defined(OS_ANDROID) \
|
| || defined(THREAD_SANITIZER)
|
| #define MAYBE_GetSizeForNewRenderView DISABLED_GetSizeForNewRenderView
|
| #else
|
|
|