Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.

Commit 539922b

Browse files
author
[email protected]
committed
Revert of MacViews: Fix WebDialogBrowserTest.SizeWindow to get browser_tests compiling on MacViews (patchset #7 of https://codereview.chromium.org/486063002/)
Reason for revert: browser_test fails in Linux ASAN/LSAN test. WebDialogBrowserTest.SizeWindow (run #1): [ RUN ] WebDialogBrowserTest.SizeWindow [30383:30383:0820/232516:ERROR:browser_main_loop.cc(162)] Running without the SUID sandbox! See https://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment for more information on developing with the sandbox on. Xlib: extension "RANDR" missing on display ":9". Xlib: extension "RANDR" missing on display ":9". [30383:30383:0820/232516:WARNING:password_store_factory.cc(215)] Using basic (unencrypted) store for password storage. See http://code.google.com/p/chromium/wiki/LinuxPasswordStorage for more information about password storage options. [30473:30473:0820/232516:ERROR:renderer_main.cc(204)] Running without renderer sandbox [30496:30496:0820/232516:ERROR:renderer_main.cc(204)] Running without renderer sandbox ================================================================= ==30383==ERROR: LeakSanitizer: detected memory leaks Direct leak of 128 byte(s) in 1 object(s) allocated from: #0 0x4f2bbb in operator new(unsigned long) (/b/build/slave/Linux_ASan_LSan_Tests__3_/build/src/out/Release/browser_tests+0x4f2bbb) #1 0x1dace96 in WebDialogBrowserTest_SizeWindow_Test::RunTestOnMainThread() chrome/browser/ui/views/web_dialog_view_browsertest.cc:95:3 #2 0x32aaae3 in InProcessBrowserTest::RunTestOnMainThreadLoop() chrome/test/base/in_process_browser_test.cc:434:5 #3 0x2d6de03 in Run base/callback.h:401:12 #4 0x2d6de03 in ChromeBrowserMainParts::PreMainMessageLoopRunImpl() chrome/browser/chrome_browser_main.cc:1555 #5 0x2d6a146 in ChromeBrowserMainParts::PreMainMessageLoopRun() chrome/browser/chrome_browser_main.cc:980:18 #6 0x59d80b7 in content::BrowserMainLoop::PreMainMessageLoopRun() content/browser/browser_main_loop.cc:736:5 #7 0x5d3ac48 in Run base/callback.h:401:12 #8 0x5d3ac48 in content::StartupTaskRunner::RunAllTasksNow() content/browser/startup_task_runner.cc:45 #9 0x59d40a0 in content::BrowserMainLoop::CreateStartupTasks() content/browser/browser_main_loop.cc:636:3 #10 0x5f3839d in content::BrowserMainRunnerImpl::Initialize(content::MainFunctionParams const&) content/browser/browser_main_runner.cc:106:5 #11 0xf90f1a5 in content::BrowserMain(content::MainFunctionParams const&) content/browser/browser_main.cc:22:19 #12 0xf8416c0 in content::ContentMainRunnerImpl::Run() content/app/content_main_runner.cc:764:12 #13 0xf83db5f in content::ContentMain(content::ContentMainParams const&) content/app/content_main.cc:19:15 #14 0xd6b57e1 in content::BrowserTestBase::SetUp() content/public/test/browser_test_base.cc:257:3 #15 0x32a773b in InProcessBrowserTest::SetUp() chrome/test/base/in_process_browser_test.cc:217:3 #16 0x3de9f81 in HandleExceptionsInMethodIfSupported\u003Ctesting::Test, void> testing/gtest/src/gtest.cc:2418:12 #17 0x3de9f81 in testing::Test::Run() testing/gtest/src/gtest.cc:2430 #18 0x3dec559 in testing::TestInfo::Run() testing/gtest/src/gtest.cc:2610:5 #19 0x3ded5b6 in testing::TestCase::Run() testing/gtest/src/gtest.cc:2728:5 #20 0x3e03055 in testing::internal::UnitTestImpl::RunAllTests() testing/gtest/src/gtest.cc:4591:11 #21 0x3e02664 in HandleExceptionsInMethodIfSupported\u003Ctesting::internal::UnitTestImpl, bool> testing/gtest/src/gtest.cc:2418:12 #22 0x3e02664 in testing::UnitTest::Run() testing/gtest/src/gtest.cc:4209 #23 0x348e02f in RUN_ALL_TESTS testing/gtest/include/gtest/gtest.h:2304:10 #24 0x348e02f in base::TestSuite::Run() base/test/test_suite.cc:227 #25 0x20fb8cd in ChromeBrowserTestSuiteRunner::RunTestSuite(int, char**) chrome/test/base/browser_tests_main.cc:14:12 #26 0xd737de7 in content::LaunchTests(content::TestLauncherDelegate*, int, int, char**) content/public/test/test_launcher.cc:469:12 #27 0x32a4b8b in LaunchChromeTests(int, ChromeTestSuiteRunner*, int, char**) chrome/test/base/chrome_test_launcher.cc:124:10 #28 0x20fb7b8 in main chrome/test/base/browser_tests_main.cc:21:10 #29 0x7feeddc6676c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 ----------------------------------------------------- Suppressions used: count bytes template 1767 75328 libfontconfig ----------------------------------------------------- SUMMARY: AddressSanitizer: 128 byte(s) leaked in 1 allocation(s). [0820/232518:ERROR:nacl_helper_linux.cc(282)] NaCl helper process running without a sandbox! Most likely you need to configure your SUID sandbox correctly WebDialogBrowserTest.SizeWindow (run #2): [ RUN ] WebDialogBrowserTest.SizeWindow [16767:16767:0820/232720:ERROR:browser_main_loop.cc(162)] Running without the SUID sandbox! See https://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment for more information on developing with the sandbox on. Xlib: extension "RANDR" missing on display ":9". Xlib: extension "RANDR" missing on display ":9". [16767:16767:0820/232720:WARNING:password_store_factory.cc(215)] Using basic (unencrypted) store for password storage. See http://code.google.com/p/chromium/wiki/LinuxPasswordStorage for more information about password storage options. [16871:16871:0820/232720:ERROR:renderer_main.cc(204)] Running without renderer sandbox [16911:16911:0820/232720:ERROR:renderer_main.cc(204)] Running without renderer sandbox ================================================================= ==16767==ERROR: LeakSanitizer: detected memory leaks Direct leak of 128 byte(s) in 1 object(s) allocated from: #0 0x4f2bbb in operator new(unsigned long) (/b/build/slave/Linux_ASan_LSan_Tests__3_/build/src/out/Release/browser_tests+0x4f2bbb) #1 0x1dace96 in WebDialogBrowserTest_SizeWindow_Test::RunTestOnMainThread() chrome/browser/ui/views/web_dialog_view_browsertest.cc:95:3 #2 0x32aaae3 in InProcessBrowserTest::RunTestOnMainThreadLoop() chrome/test/base/in_process_browser_test.cc:434:5 #3 0x2d6de03 in Run base/callback.h:401:12 #4 0x2d6de03 in ChromeBrowserMainParts::PreMainMessageLoopRunImpl() chrome/browser/chrome_browser_main.cc:1555 #5 0x2d6a146 in ChromeBrowserMainParts::PreMainMessageLoopRun() chrome/browser/chrome_browser_main.cc:980:18 #6 0x59d80b7 in content::BrowserMainLoop::PreMainMessageLoopRun() content/browser/browser_main_loop.cc:736:5 #7 0x5d3ac48 in Run base/callback.h:401:12 #8 0x5d3ac48 in content::StartupTaskRunner::RunAllTasksNow() content/browser/startup_task_runner.cc:45 #9 0x59d40a0 in content::BrowserMainLoop::CreateStartupTasks() content/browser/browser_main_loop.cc:636:3 #10 0x5f3839d in content::BrowserMainRunnerImpl::Initialize(content::MainFunctionParams const&) content/browser/browser_main_runner.cc:106:5 #11 0xf90f1a5 in content::BrowserMain(content::MainFunctionParams const&) content/browser/browser_main.cc:22:19 #12 0xf8416c0 in content::ContentMainRunnerImpl::Run() content/app/content_main_runner.cc:764:12 #13 0xf83db5f in content::ContentMain(content::ContentMainParams const&) content/app/content_main.cc:19:15 #14 0xd6b57e1 in content::BrowserTestBase::SetUp() content/public/test/browser_test_base.cc:257:3 #15 0x32a773b in InProcessBrowserTest::SetUp() chrome/test/base/in_process_browser_test.cc:217:3 #16 0x3de9f81 in HandleExceptionsInMethodIfSupported\u003Ctesting::Test, void> testing/gtest/src/gtest.cc:2418:12 #17 0x3de9f81 in testing::Test::Run() testing/gtest/src/gtest.cc:2430 #18 0x3dec559 in testing::TestInfo::Run() testing/gtest/src/gtest.cc:2610:5 #19 0x3ded5b6 in testing::TestCase::Run() testing/gtest/src/gtest.cc:2728:5 #20 0x3e03055 in testing::internal::UnitTestImpl::RunAllTests() testing/gtest/src/gtest.cc:4591:11 #21 0x3e02664 in HandleExceptionsInMethodIfSupported\u003Ctesting::internal::UnitTestImpl, bool> testing/gtest/src/gtest.cc:2418:12 #22 0x3e02664 in testing::UnitTest::Run() testing/gtest/src/gtest.cc:4209 #23 0x348e02f in RUN_ALL_TESTS testing/gtest/include/gtest/gtest.h:2304:10 #24 0x348e02f in base::TestSuite::Run() base/test/test_suite.cc:227 #25 0x20fb8cd in ChromeBrowserTestSuiteRunner::RunTestSuite(int, char**) chrome/test/base/browser_tests_main.cc:14:12 #26 0xd737de7 in content::LaunchTests(content::TestLauncherDelegate*, int, int, char**) content/public/test/test_launcher.cc:469:12 #27 0x32a4b8b in LaunchChromeTests(int, ChromeTestSuiteRunner*, int, char**) chrome/test/base/chrome_test_launcher.cc:124:10 #28 0x20fb7b8 in main chrome/test/base/browser_tests_main.cc:21:10 #29 0x7fb13f28476c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 ----------------------------------------------------- Suppressions used: count bytes template 1767 75328 libfontconfig ----------------------------------------------------- SUMMARY: AddressSanitizer: 128 byte(s) leaked in 1 allocation(s). [0820/232722:ERROR:nacl_helper_linux.cc(282)] NaCl helper process running without a sandbox! Most likely you need to configure your SUID sandbox correctly WebDialogBrowserTest.SizeWindow (run #3): [ RUN ] WebDialogBrowserTest.SizeWindow [16994:16994:0820/232723:ERROR:browser_main_loop.cc(162)] Running without the SUID sandbox! See https://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment for more information on developing with the sandbox on. Xlib: extension "RANDR" missing on display ":9". Xlib: extension "RANDR" missing on display ":9". [16994:16994:0820/232724:WARNING:password_store_factory.cc(215)] Using basic (unencrypted) store for password storage. See http://code.google.com/p/chromium/wiki/LinuxPasswordStorage for more information about password storage options. [17026:17026:0820/232724:ERROR:renderer_main.cc(204)] Running without renderer sandbox [17038:17038:0820/232724:ERROR:renderer_main.cc(204)] Running without renderer sandbox ================================================================= ==16994==ERROR: LeakSanitizer: detected memory leaks Direct leak of 128 byte(s) in 1 object(s) allocated from: #0 0x4f2bbb in operator new(unsigned long) (/b/build/slave/Linux_ASan_LSan_Tests__3_/build/src/out/Release/browser_tests+0x4f2bbb) #1 0x1dace96 in WebDialogBrowserTest_SizeWindow_Test::RunTestOnMainThread() chrome/browser/ui/views/web_dialog_view_browsertest.cc:95:3 #2 0x32aaae3 in InProcessBrowserTest::RunTestOnMainThreadLoop() chrome/test/base/in_process_browser_test.cc:434:5 #3 0x2d6de03 in Run base/callback.h:401:12 #4 0x2d6de03 in ChromeBrowserMainParts::PreMainMessageLoopRunImpl() chrome/browser/chrome_browser_main.cc:1555 #5 0x2d6a146 in ChromeBrowserMainParts::PreMainMessageLoopRun() chrome/browser/chrome_browser_main.cc:980:18 #6 0x59d80b7 in content::BrowserMainLoop::PreMainMessageLoopRun() content/browser/browser_main_loop.cc:736:5 #7 0x5d3ac48 in Run base/callback.h:401:12 #8 0x5d3ac48 in content::StartupTaskRunner::RunAllTasksNow() content/browser/startup_task_runner.cc:45 #9 0x59d40a0 in content::BrowserMainLoop::CreateStartupTasks() content/browser/browser_main_loop.cc:636:3 #10 0x5f3839d in content::BrowserMainRunnerImpl::Initialize(content::MainFunctionParams const&) content/browser/browser_main_runner.cc:106:5 #11 0xf90f1a5 in content::BrowserMain(content::MainFunctionParams const&) content/browser/browser_main.cc:22:19 #12 0xf8416c0 in content::ContentMainRunnerImpl::Run() content/app/content_main_runner.cc:764:12 #13 0xf83db5f in content::ContentMain(content::ContentMainParams const&) content/app/content_main.cc:19:15 #14 0xd6b57e1 in content::BrowserTestBase::SetUp() content/public/test/browser_test_base.cc:257:3 #15 0x32a773b in InProcessBrowserTest::SetUp() chrome/test/base/in_process_browser_test.cc:217:3 #16 0x3de9f81 in HandleExceptionsInMethodIfSupported\u003Ctesting::Test, void> testing/gtest/src/gtest.cc:2418:12 #17 0x3de9f81 in testing::Test::Run() testing/gtest/src/gtest.cc:2430 #18 0x3dec559 in testing::TestInfo::Run() testing/gtest/src/gtest.cc:2610:5 #19 0x3ded5b6 in testing::TestCase::Run() testing/gtest/src/gtest.cc:2728:5 #20 0x3e03055 in testing::internal::UnitTestImpl::RunAllTests() testing/gtest/src/gtest.cc:4591:11 #21 0x3e02664 in HandleExceptionsInMethodIfSupported\u003Ctesting::internal::UnitTestImpl, bool> testing/gtest/src/gtest.cc:2418:12 #22 0x3e02664 in testing::UnitTest::Run() testing/gtest/src/gtest.cc:4209 #23 0x348e02f in RUN_ALL_TESTS testing/gtest/include/gtest/gtest.h:2304:10 #24 0x348e02f in base::TestSuite::Run() base/test/test_suite.cc:227 #25 0x20fb8cd in ChromeBrowserTestSuiteRunner::RunTestSuite(int, char**) chrome/test/base/browser_tests_main.cc:14:12 #26 0xd737de7 in content::LaunchTests(content::TestLauncherDelegate*, int, int, char**) content/public/test/test_launcher.cc:469:12 #27 0x32a4b8b in LaunchChromeTests(int, ChromeTestSuiteRunner*, int, char**) chrome/test/base/chrome_test_launcher.cc:124:10 #28 0x20fb7b8 in main chrome/test/base/browser_tests_main.cc:21:10 #29 0x7f0688ff376c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 ----------------------------------------------------- Suppressions used: count bytes template 1767 75328 libfontconfig ----------------------------------------------------- SUMMARY: AddressSanitizer: 128 byte(s) leaked in 1 allocation(s). [0820/232725:ERROR:nacl_helper_linux.cc(282)] NaCl helper process running without a sandbox! Most likely you need to configure your SUID sandbox correctly WebDialogBrowserTest.SizeWindow (run #4): [ RUN ] WebDialogBrowserTest.SizeWindow [17073:17073:0820/232726:ERROR:browser_main_loop.cc(162)] Running without the SUID sandbox! See https://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment for more information on developing with the sandbox on. Xlib: extension "RANDR" missing on display ":9". Xlib: extension "RANDR" missing on display ":9". [17073:17073:0820/232726:WARNING:password_store_factory.cc(215)] Using basic (unencrypted) store for password storage. See http://code.google.com/p/chromium/wiki/LinuxPasswordStorage for more information about password storage options. [17105:17105:0820/232726:ERROR:renderer_main.cc(204)] Running without renderer sandbox [17116:17116:0820/232726:ERROR:renderer_main.cc(204)] Running without renderer sandbox ================================================================= ==17073==ERROR: LeakSanitizer: detected memory leaks Direct leak of 128 byte(s) in 1 object(s) allocated from: #0 0x4f2bbb in operator new(unsigned long) (/b/build/slave/Linux_ASan_LSan_Tests__3_/build/src/out/Release/browser_tests+0x4f2bbb) #1 0x1dace96 in WebDialogBrowserTest_SizeWindow_Test::RunTestOnMainThread() chrome/browser/ui/views/web_dialog_view_browsertest.cc:95:3 #2 0x32aaae3 in InProcessBrowserTest::RunTestOnMainThreadLoop() chrome/test/base/in_process_browser_test.cc:434:5 #3 0x2d6de03 in Run base/callback.h:401:12 #4 0x2d6de03 in ChromeBrowserMainParts::PreMainMessageLoopRunImpl() chrome/browser/chrome_browser_main.cc:1555 #5 0x2d6a146 in ChromeBrowserMainParts::PreMainMessageLoopRun() chrome/browser/chrome_browser_main.cc:980:18 #6 0x59d80b7 in content::BrowserMainLoop::PreMainMessageLoopRun() content/browser/browser_main_loop.cc:736:5 #7 0x5d3ac48 in Run base/callback.h:401:12 #8 0x5d3ac48 in content::StartupTaskRunner::RunAllTasksNow() content/browser/startup_task_runner.cc:45 #9 0x59d40a0 in content::BrowserMainLoop::CreateStartupTasks() content/browser/browser_main_loop.cc:636:3 #10 0x5f3839d in content::BrowserMainRunnerImpl::Initialize(content::MainFunctionParams const&) content/browser/browser_main_runner.cc:106:5 #11 0xf90f1a5 in content::BrowserMain(content::MainFunctionParams const&) content/browser/browser_main.cc:22:19 #12 0xf8416c0 in content::ContentMainRunnerImpl::Run() content/app/content_main_runner.cc:764:12 #13 0xf83db5f in content::ContentMain(content::ContentMainParams const&) content/app/content_main.cc:19:15 #14 0xd6b57e1 in content::BrowserTestBase::SetUp() content/public/test/browser_test_base.cc:257:3 #15 0x32a773b in InProcessBrowserTest::SetUp() chrome/test/base/in_process_browser_test.cc:217:3 #16 0x3de9f81 in HandleExceptionsInMethodIfSupported\u003Ctesting::Test, void> testing/gtest/src/gtest.cc:2418:12 #17 0x3de9f81 in testing::Test::Run() testing/gtest/src/gtest.cc:2430 #18 0x3dec559 in testing::TestInfo::Run() testing/gtest/src/gtest.cc:2610:5 #19 0x3ded5b6 in testing::TestCase::Run() testing/gtest/src/gtest.cc:2728:5 #20 0x3e03055 in testing::internal::UnitTestImpl::RunAllTests() testing/gtest/src/gtest.cc:4591:11 #21 0x3e02664 in HandleExceptionsInMethodIfSupported\u003Ctesting::internal::UnitTestImpl, bool> testing/gtest/src/gtest.cc:2418:12 #22 0x3e02664 in testing::UnitTest::Run() testing/gtest/src/gtest.cc:4209 #23 0x348e02f in RUN_ALL_TESTS testing/gtest/include/gtest/gtest.h:2304:10 #24 0x348e02f in base::TestSuite::Run() base/test/test_suite.cc:227 #25 0x20fb8cd in ChromeBrowserTestSuiteRunner::RunTestSuite(int, char**) chrome/test/base/browser_tests_main.cc:14:12 #26 0xd737de7 in content::LaunchTests(content::TestLauncherDelegate*, int, int, char**) content/public/test/test_launcher.cc:469:12 #27 0x32a4b8b in LaunchChromeTests(int, ChromeTestSuiteRunner*, int, char**) chrome/test/base/chrome_test_launcher.cc:124:10 #28 0x20fb7b8 in main chrome/test/base/browser_tests_main.cc:21:10 #29 0x7f5f8410c76c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 ----------------------------------------------------- Suppressions used: count bytes template 1767 75328 libfontconfig ----------------------------------------------------- SUMMARY: AddressSanitizer: 128 byte(s) leaked in 1 allocation(s). [0820/232728:ERROR:nacl_helper_linux.cc(282)] NaCl helper process running without a sandbox! Most likely you need to configure your SUID sandbox correctly Original issue's description: > MacViews: Fix WebDialogBrowserTest.SizeWindow to get browser_tests compiling on MacViews > > gyp changes are made to filter out toolkit-views browser_tests that > aren't yet compiled in to a toolkit-views Chrome binary on Mac. > > One, WebDialogBrowserTest.SizeWindow, was a disabled test (disabled for > 4 years :o). It was preventing browser_tests compiling on MacViews > because it was passing a gfx::NativeWindow to CreateWindowWithParent, > which takes a view. > > The parent isn't important for the test - it's just adding widget > context. This CL changes the parent to be web_contents->GetNativeView() > instead so the test compiles. > > To ensure nothing breaks, the test needs to be enabled. According to the > comment, the reasons for it being disabled on Windows still seem > relevant. However, on Linux the test was just timing out due to a quirk > of the test. So the quirk is fixed, and WebDialogBrowserTest.SizeWindow > is enabled on Linux Aura. > > The test is also enabled on Mac, but currently fails because > NativeViewHost isn't implemented yet. That's coming, and leaving the > test enabled will ensure we check it. > > With this change browser_tests compiles and links on toolkit-views Mac. > > BUG=404979, 399191, 52602 > TEST=browser_tests > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=290998 [email protected],[email protected] NOTREECHECKS=true NOTRY=true BUG=404979, 399191, 52602 Review URL: https://codereview.chromium.org/490123002 Cr-Commit-Position: refs/heads/master@{#291014} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291014 0039d316-1c4b-4281-b951-d872f2087c98
1 parent 8e9b6b3 commit 539922b

File tree

2 files changed

+18
-45
lines changed

2 files changed

+18
-45
lines changed

‎chrome/browser/ui/views/web_dialog_view_browsertest.cc

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,12 @@ class WebDialogBrowserTest : public InProcessBrowserTest {
8484
WebDialogBrowserTest() {}
8585
};
8686

87-
// Windows has some issues resizing windows. An off by one problem, and a
88-
// minimum size that seems too big. See http://crbug.com/52602.
89-
#if defined(OS_WIN)
90-
#define MAYBE_SizeWindow DISABLED_SizeWindow
91-
#else
92-
#define MAYBE_SizeWindow SizeWindow
93-
#endif
94-
IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) {
87+
// http://code.google.com/p/chromium/issues/detail?id=52602
88+
// Windows has some issues resizing windows- an off by one problem,
89+
// and a minimum size that seems too big. This file isn't included in
90+
// Mac builds yet. On Chrome OS, this test doesn't apply since ChromeOS
91+
// doesn't allow resizing of windows.
92+
IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, DISABLED_SizeWindow) {
9593
ui::test::TestWebDialogDelegate* delegate =
9694
new ui::test::TestWebDialogDelegate(
9795
GURL(chrome::kChromeUIChromeURLsURL));
@@ -102,7 +100,8 @@ IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) {
102100
WebContents* web_contents =
103101
browser()->tab_strip_model()->GetActiveWebContents();
104102
ASSERT_TRUE(web_contents != NULL);
105-
views::Widget::CreateWindowWithParent(view, web_contents->GetNativeView());
103+
views::Widget::CreateWindowWithParent(
104+
view, web_contents->GetTopLevelNativeWindow());
106105
view->GetWidget()->Show();
107106

108107
// TestWebDialogView should quit current message loop on size change.
@@ -146,10 +145,7 @@ IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) {
146145
EXPECT_GE(set_bounds.height(), rwhv_bounds.height());
147146

148147
// Get very small.
149-
const gfx::Size min_size = view->GetWidget()->GetMinimumSize();
150-
EXPECT_LT(0, min_size.width());
151-
EXPECT_LT(0, min_size.height());
152-
148+
gfx::Size min_size = view->GetWidget()->GetMinimumSize();
153149
set_bounds.set_size(min_size);
154150

155151
view->MoveContents(web_contents, set_bounds);
@@ -164,26 +160,13 @@ IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) {
164160
EXPECT_GE(set_bounds.width(), rwhv_bounds.width());
165161
EXPECT_GE(set_bounds.height(), rwhv_bounds.height());
166162

167-
// Check to make sure we can't get to 0x0. First expand beyond the minimum
168-
// size that was set above so that TestWebDialogView has a change to pick up.
169-
set_bounds.set_height(250);
170-
view->MoveContents(web_contents, set_bounds);
171-
content::RunMessageLoop(); // TestWebDialogView will quit.
172-
actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
173-
EXPECT_EQ(set_bounds, actual_bounds);
174-
175-
// Now verify that attempts to re-size to 0x0 enforces the minimum size.
163+
// Check to make sure we can't get to 0x0
176164
set_bounds.set_width(0);
177165
set_bounds.set_height(0);
178166

179167
view->MoveContents(web_contents, set_bounds);
180168
content::RunMessageLoop(); // TestWebDialogView will quit.
181169
actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
182-
EXPECT_EQ(min_size, actual_bounds.size());
183-
184-
// And that the render view is also non-zero.
185-
rwhv_bounds =
186-
view->web_contents()->GetRenderWidgetHostView()->GetViewBounds();
187-
EXPECT_LT(0, rwhv_bounds.width());
188-
EXPECT_LT(0, rwhv_bounds.height());
170+
EXPECT_LT(0, actual_bounds.width());
171+
EXPECT_LT(0, actual_bounds.height());
189172
}

‎chrome/chrome_tests.gypi

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1943,7 +1943,6 @@
19431943
'../third_party/ocmock/ocmock.gyp:ocmock',
19441944
],
19451945
'sources': [
1946-
'browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc',
19471946
'browser/renderer_host/chrome_render_widget_host_view_mac_delegate_browsertest.cc',
19481947
'browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm',
19491948
'browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc',
@@ -1952,20 +1951,6 @@
19521951
# TODO(groby): This test depends on hunspell and we cannot run it on
19531952
# Mac, which does not use hunspell by default.
19541953
'browser/spellchecker/spellcheck_service_browsertest.cc',
1955-
1956-
# TODO(tapted): Enable toolkit-views browser_tests on Mac when their
1957-
# respective implementations are linked in. http://crbug.com/404979.
1958-
'browser/ui/views/autofill/autofill_dialog_view_tester_views.cc',
1959-
'browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc',
1960-
'browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc',
1961-
'browser/ui/views/frame/browser_view_browsertest.cc',
1962-
'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
1963-
'browser/ui/views/profiles/avatar_menu_button_browsertest.cc',
1964-
'browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc',
1965-
'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',
1966-
'browser/ui/views/toolbar/browser_actions_container_browsertest.cc',
1967-
'browser/ui/views/translate/translate_bubble_view_browsertest.cc',
1968-
19691954
# TODO(rouslan): This test depends on the custom dictionary UI,
19701955
# which is disabled on Mac.
19711956
'browser/ui/webui/options/edit_dictionary_browsertest.js',
@@ -1983,13 +1968,18 @@
19831968
'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc',
19841969
'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc',
19851970
],
1986-
}], # OS=="mac"
1971+
}],
19871972
['OS=="mac" or OS=="win"', {
19881973
'sources': [
19891974
'browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc',
19901975
'browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc',
19911976
],
19921977
}],
1978+
['OS=="mac"', {
1979+
'sources': [
1980+
'browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc',
1981+
],
1982+
}],
19931983
['os_posix == 0 or chromeos == 1', {
19941984
'sources!': [
19951985
'common/time_format_browsertest.cc',

0 commit comments

Comments
 (0)