diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 21:19:27 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 21:19:27 +0000 |
| commit | 35f7d2144b8aae4bdc1509961738e6bf71d6021c (patch) | |
| tree | 2b5a7ba48e9e86084f96d8ad4a809f6733257d41 /chrome/test | |
| parent | f3089a667ef63143572a19a0ade9644d38cd3757 (diff) | |
| download | chromium_src-35f7d2144b8aae4bdc1509961738e6bf71d6021c.zip chromium_src-35f7d2144b8aae4bdc1509961738e6bf71d6021c.tar.gz chromium_src-35f7d2144b8aae4bdc1509961738e6bf71d6021c.tar.bz2 | |
Second attempt at cleaning up handling of --disable-popup-blocking. I didn't realize that now window.open() will result in a popup with this flag, where before it resulted in a tab. This necessitated changes to a test that expected one window and two tabs to expect two windows each with one tab.
I also fixed the test to not crash when some expectations were not met (by using ASSERT_ instead of EXPECT_), and to properly use (expected, actual) instead of (actual, expected).
Review URL: http://codereview.chromium.org/99203
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/automation/automation_proxy_uitest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index b1d49dc..4f27abc 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -1164,5 +1164,5 @@ TEST_F(AutomationProxyTest5, TestLifetimeOfDomAutomationController) { std::wstring jscript = CreateJSString(L"\"" + expected + L"\""); std::wstring actual; ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual)); - ASSERT_STREQ(expected.c_str(), actual.c_str()); + ASSERT_EQ(expected, actual); } |