diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 17:40:14 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 17:40:14 +0000 |
commit | 8c066b46d11fea5c568ac9d13e5f60ad9611b6ae (patch) | |
tree | 7638fc03c5e1f3d16b592b55f5174196ba54fa68 /chrome/test | |
parent | b527ebf1b33cf3e1308339785771a6c6d0ca84d0 (diff) | |
download | chromium_src-8c066b46d11fea5c568ac9d13e5f60ad9611b6ae.zip chromium_src-8c066b46d11fea5c568ac9d13e5f60ad9611b6ae.tar.gz chromium_src-8c066b46d11fea5c568ac9d13e5f60ad9611b6ae.tar.bz2 |
Revert 233622 "Revert 233612 "Convert PhishingClassifierTest to ..."
Reverting the revert because it triggered incorrect code that was fixed in r233633.
> Revert 233612 "Convert PhishingClassifierTest to a real browser ..."
>
> See http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%283%29/builds/23217/steps/browser_tests/logs/stdio
>
> [ RUN ] PhishingClassifierTest.TestClassification
> [3992:3100:1107/081056:2569617:ERROR:proxy_service_factory.cc(103)] Cannot use V8 Proxy resolver in single process mode.
> [3992:3100:1107/081057:2569882:ERROR:proxy_service_factory.cc(103)] Cannot use V8 Proxy resolver in single process mode.
> [3992:1468:1107/081057:2570100:ERROR:chrome_views_delegate.cc(172)] NOT IMPLEMENTED
> [3992:1468:1107/081057:2570100:ERROR:desktop_root_window_host_win.cc(694)] NOT IMPLEMENTED
> [3992:3100:1107/081057:2570522:ERROR:gpu_message_filter.cc(189)] Renderer 3 tried to access a surface for renderer 0
> [3992:3100:1107/081057:2570537:ERROR:gpu_message_filter.cc(189)] Renderer 3 tried to access a surface for renderer 0
> [3992:3100:1107/081057:2570537:ERROR:gpu_message_filter.cc(189)] Renderer 3 tried to access a surface for renderer 0
> [3992:3100:1107/081057:2570537:ERROR:gpu_message_filter.cc(189)] Renderer 3 tried to access a surface for renderer 0
> HTTPS server started on 127.0.0.1:50725...
> sending server_data: {"host": "127.0.0.1", "port": 50725} (36 bytes)
> [3992:3100:1107/081100:2573080:ERROR:gpu_message_filter.cc(189)] Renderer 3 tried to access a surface for renderer 0
> [3992:3100:1107/081100:2573080:ERROR:gpu_message_filter.cc(189)] Renderer 3 tried to access a surface for renderer 0
> [3992:3100:1107/081100:2573439:ERROR:gpu_message_filter.cc(189)] Renderer 3 tried to access a surface for renderer 0
> [3992:3100:1107/081100:2573439:ERROR:gpu_message_filter.cc(189)] Renderer 3 tried to access a surface for renderer 0
> c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\vector(70) : Assertion failed: vector iterator not dereferencable
> c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\vector(71) : Assertion failed: "Standard C++ Libraries Out of Range" && 0
> [631/631] PhishingClassifierTest.TestClassification (4435 ms)
>
> > Convert PhishingClassifierTest to a real browser test.
> >
> > Because creation of child frames now uses a synchronous IPC, all users of RenderViewFakeResourcesTest deadlock. This converts the PhishingClassifierTest to a real browser test which avoids the deadlock.
> >
> > BUG=245126
> >
> > Review URL: https://codereview.chromium.org/55983006
>
> TBR=ajwong@chromium.org
>
> Review URL: https://codereview.chromium.org/64133004
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/59903009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/base/ui_test_utils.cc | 8 | ||||
-rw-r--r-- | chrome/test/base/ui_test_utils.h | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 4f65067..88c1e43 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -163,6 +163,14 @@ void NavigateToURL(chrome::NavigateParams* params) { content::WaitForLoadStop(params->target_contents); } + +void NavigateToURLWithPost(Browser* browser, const GURL& url) { + chrome::NavigateParams params(browser, url, + content::PAGE_TRANSITION_FORM_SUBMIT); + params.uses_post = true; + NavigateToURL(¶ms); +} + void NavigateToURL(Browser* browser, const GURL& url) { NavigateToURLWithDisposition(browser, url, CURRENT_TAB, BROWSER_TEST_WAIT_FOR_NAVIGATION); diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h index 60de349..b7fe6da 100644 --- a/chrome/test/base/ui_test_utils.h +++ b/chrome/test/base/ui_test_utils.h @@ -88,6 +88,10 @@ Browser* OpenURLOffTheRecord(Profile* profile, const GURL& url); void NavigateToURL(chrome::NavigateParams* params); // Navigates the selected tab of |browser| to |url|, blocking until the +// navigation finishes. Simulates a POST and uses chrome::Navigate. +void NavigateToURLWithPost(Browser* browser, const GURL& url); + +// Navigates the selected tab of |browser| to |url|, blocking until the // navigation finishes. Uses Browser::OpenURL --> chrome::Navigate. void NavigateToURL(Browser* browser, const GURL& url); |