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

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

Issue 19906002: Move data/ directory from WebKit/chromium/tests into web/tests/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 years, 5 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
« no previous file with comments | « Source/web/tests/URLTestHelpers.cpp ('k') | Source/web/tests/WebImageTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 3332 matching lines...) Expand 10 before | Expand all | Expand 10 after
3343 EXPECT_TRUE(client.wasUserScroll()); 3343 EXPECT_TRUE(client.wasUserScroll());
3344 client.reset(); 3344 client.reset();
3345 3345
3346 m_webView->close(); 3346 m_webView->close();
3347 m_webView = 0; 3347 m_webView = 0;
3348 } 3348 }
3349 3349
3350 TEST_F(WebFrameTest, FirstPartyForCookiesForRedirect) 3350 TEST_F(WebFrameTest, FirstPartyForCookiesForRedirect)
3351 { 3351 {
3352 WTF::String filePath = Platform::current()->unitTestSupport()->webKitRootDir (); 3352 WTF::String filePath = Platform::current()->unitTestSupport()->webKitRootDir ();
3353 filePath.append("/Source/WebKit/chromium/tests/data/first_party.html"); 3353 filePath.append("/Source/web/tests/data/first_party.html");
3354 3354
3355 WebURL testURL(toKURL("http://www.test.com/first_party_redirect.html")); 3355 WebURL testURL(toKURL("http://www.test.com/first_party_redirect.html"));
3356 char redirect[] = "http://www.test.com/first_party.html"; 3356 char redirect[] = "http://www.test.com/first_party.html";
3357 WebURL redirectURL(toKURL(redirect)); 3357 WebURL redirectURL(toKURL(redirect));
3358 WebURLResponse redirectResponse; 3358 WebURLResponse redirectResponse;
3359 redirectResponse.initialize(); 3359 redirectResponse.initialize();
3360 redirectResponse.setMIMEType("text/html"); 3360 redirectResponse.setMIMEType("text/html");
3361 redirectResponse.setHTTPStatusCode(302); 3361 redirectResponse.setHTTPStatusCode(302);
3362 redirectResponse.setHTTPHeaderField("Location", redirect); 3362 redirectResponse.setHTTPHeaderField("Location", redirect);
3363 Platform::current()->unitTestSupport()->registerMockedURL(testURL, redirectR esponse, filePath); 3363 Platform::current()->unitTestSupport()->registerMockedURL(testURL, redirectR esponse, filePath);
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
3461 webViewImpl->page()->mainFrame()->loader()->load(frameRequest); 3461 webViewImpl->page()->mainFrame()->loader()->load(frameRequest);
3462 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(); 3462 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
3463 3463
3464 EXPECT_TRUE(client.frameLoadTypeSameSeen()); 3464 EXPECT_TRUE(client.frameLoadTypeSameSeen());
3465 m_webView->close(); 3465 m_webView->close();
3466 m_webView = 0; 3466 m_webView = 0;
3467 } 3467 }
3468 3468
3469 3469
3470 } // namespace 3470 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/URLTestHelpers.cpp ('k') | Source/web/tests/WebImageTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698