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

Side by Side Diff: Source/core/testing/URLTestHelpers.cpp

Issue 570563003: Implement CSP check for manifest fetching (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed nit from mkwst Created 6 years, 2 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/core/testing/URLTestHelpers.h ('k') | Source/web/AssociatedURLLoader.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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 { 50 {
51 registerMockedURLLoad(fullURL, fileName, WebString::fromUTF8(""), mimeType); 51 registerMockedURLLoad(fullURL, fileName, WebString::fromUTF8(""), mimeType);
52 } 52 }
53 53
54 void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con st WebString& relativeBaseDirectory, const WebString& mimeType) 54 void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con st WebString& relativeBaseDirectory, const WebString& mimeType)
55 { 55 {
56 WebURLResponse response(fullURL); 56 WebURLResponse response(fullURL);
57 response.setMIMEType(mimeType); 57 response.setMIMEType(mimeType);
58 response.setHTTPStatusCode(200); 58 response.setHTTPStatusCode(200);
59 59
60 registerMockedURLLoadWithCustomResponse(fullURL, fileName, relativeBaseDirec tory, response);
61 }
62
63 void registerMockedURLLoadWithCustomResponse(const WebURL& fullURL, const WebStr ing& fileName, const WebString& relativeBaseDirectory, WebURLResponse response)
64 {
60 // Physical file path for the mock = <webkitRootDir> + relativeBaseDirectory + fileName. 65 // Physical file path for the mock = <webkitRootDir> + relativeBaseDirectory + fileName.
61 std::string filePath = std::string(Platform::current()->unitTestSupport()->w ebKitRootDir().utf8().data()); 66 std::string filePath = std::string(Platform::current()->unitTestSupport()->w ebKitRootDir().utf8().data());
62 filePath.append("/Source/web/tests/data/"); 67 filePath.append("/Source/web/tests/data/");
63 filePath.append(std::string(relativeBaseDirectory.utf8().data())); 68 filePath.append(std::string(relativeBaseDirectory.utf8().data()));
64 filePath.append(std::string(fileName.utf8().data())); 69 filePath.append(std::string(fileName.utf8().data()));
65 70
66 Platform::current()->unitTestSupport()->registerMockedURL(fullURL, response, WebString::fromUTF8(filePath.c_str())); 71 Platform::current()->unitTestSupport()->registerMockedURL(fullURL, response, WebString::fromUTF8(filePath.c_str()));
67 } 72 }
68 73
69 } // namespace URLTestHelpers 74 } // namespace URLTestHelpers
70 } // namespace blink 75 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/testing/URLTestHelpers.h ('k') | Source/web/AssociatedURLLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698