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

Side by Side Diff: Source/web/tests/URLTestHelpers.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/AssociatedURLLoaderTest.cpp ('k') | Source/web/tests/WebFrameTest.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) 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con st WebString& relativeBaseDirectory, const WebString& mimeType) 55 void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con st WebString& relativeBaseDirectory, const WebString& mimeType)
56 { 56 {
57 WebURLResponse response; 57 WebURLResponse response;
58 response.initialize(); 58 response.initialize();
59 response.setMIMEType(mimeType); 59 response.setMIMEType(mimeType);
60 response.setHTTPStatusCode(200); 60 response.setHTTPStatusCode(200);
61 61
62 // Physical file path for the mock = <webkitRootDir> + relativeBaseDirectory + fileName. 62 // Physical file path for the mock = <webkitRootDir> + relativeBaseDirectory + fileName.
63 std::string filePath = std::string(Platform::current()->unitTestSupport()->w ebKitRootDir().utf8().data()); 63 std::string filePath = std::string(Platform::current()->unitTestSupport()->w ebKitRootDir().utf8().data());
64 filePath.append("/Source/WebKit/chromium/tests/data/"); 64 filePath.append("/Source/web/tests/data/");
65 filePath.append(std::string(relativeBaseDirectory.utf8().data())); 65 filePath.append(std::string(relativeBaseDirectory.utf8().data()));
66 filePath.append(std::string(fileName.utf8().data())); 66 filePath.append(std::string(fileName.utf8().data()));
67 67
68 Platform::current()->unitTestSupport()->registerMockedURL(fullURL, response, WebString::fromUTF8(filePath.c_str())); 68 Platform::current()->unitTestSupport()->registerMockedURL(fullURL, response, WebString::fromUTF8(filePath.c_str()));
69 } 69 }
70 70
71 } // namespace URLTestHelpers 71 } // namespace URLTestHelpers
72 } // namespace WebKit 72 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/web/tests/AssociatedURLLoaderTest.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698