Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(847)

Side by Side Diff: Source/web/tests/PrerenderingTest.cpp

Issue 272143002: Revert of Fix webkit_unit_tests to use the threaded parser and enable everywhere. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 } 183 }
184 184
185 void initialize(const char* baseURL, const char* fileName) 185 void initialize(const char* baseURL, const char* fileName)
186 { 186 {
187 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL ), WebString::fromUTF8(fileName)); 187 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL ), WebString::fromUTF8(fileName));
188 const bool RunJavascript = true; 188 const bool RunJavascript = true;
189 m_webViewHelper.initialize(RunJavascript); 189 m_webViewHelper.initialize(RunJavascript);
190 m_webViewHelper.webView()->setPrerendererClient(&m_prerendererClient); 190 m_webViewHelper.webView()->setPrerendererClient(&m_prerendererClient);
191 191
192 FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(), std: :string(baseURL) + fileName); 192 FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(), std: :string(baseURL) + fileName);
193 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests( );
193 } 194 }
194 195
195 void navigateAway() 196 void navigateAway()
196 { 197 {
197 FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(), "abo ut:blank"); 198 FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(), "abo ut:blank");
198 } 199 }
199 200
200 void close() 201 void close()
201 { 202 {
202 m_webViewHelper.webView()->mainFrame()->collectGarbage(); 203 m_webViewHelper.webView()->mainFrame()->collectGarbage();
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 WebPrerender relNextOnly = prerendererClient()->releaseWebPrerender(); 499 WebPrerender relNextOnly = prerendererClient()->releaseWebPrerender();
499 EXPECT_EQ(toWebURL("http://rel-next-only.com/"), relNextOnly.url()); 500 EXPECT_EQ(toWebURL("http://rel-next-only.com/"), relNextOnly.url());
500 EXPECT_EQ(PrerenderRelTypeNext, relNextOnly.relTypes()); 501 EXPECT_EQ(PrerenderRelTypeNext, relNextOnly.relTypes());
501 502
502 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender( ); 503 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender( );
503 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"), relNextAndPrerende r.url()); 504 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"), relNextAndPrerende r.url());
504 EXPECT_EQ(static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrere nder), relNextAndPrerender.relTypes()); 505 EXPECT_EQ(static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrere nder), relNextAndPrerender.relTypes());
505 } 506 }
506 507
507 } // namespace 508 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/PopupMenuTest.cpp ('k') | Source/web/tests/ScrollingCoordinatorChromiumTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698