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

Unified Diff: net/proxy/proxy_script_fetcher_impl_unittest.cc

Issue 274183002: Make it possible to build cronet without icu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Oops...add back file 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/net.gypi ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_script_fetcher_impl_unittest.cc
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index b90285012e452a7530eb12586e34137bb99be0ec..2536b029b4b3a64eab98ee4d6f21c79d8a942d12 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -91,6 +91,7 @@ class RequestContext : public URLRequestContext {
URLRequestContextStorage storage_;
};
+#if !defined(DISABLE_FILE_SUPPORT)
// Get a file:// url relative to net/data/proxy/proxy_script_fetcher_unittest.
GURL GetTestFileUrl(const std::string& relpath) {
base::FilePath path;
@@ -101,6 +102,7 @@ GURL GetTestFileUrl(const std::string& relpath) {
GURL base_url = FilePathToFileURL(path);
return GURL(base_url.spec() + "/" + relpath);
}
+#endif // !defined(DISABLE_FILE_SUPPORT)
// Really simple NetworkDelegate so we can allow local file access on ChromeOS
// without introducing layering violations. Also causes a test failure if a
@@ -352,7 +354,9 @@ TEST_F(ProxyScriptFetcherImplTest, TooLarge) {
// These two URLs are the same file, but are http:// vs file://
GURL urls[] = {
test_server_.GetURL("files/large-pac.nsproxy"),
+#if !defined(DISABLE_FILE_SUPPORT)
GetTestFileUrl("large-pac.nsproxy")
+#endif
};
// Try fetching URLs that are 101 bytes large. We should abort the request
« no previous file with comments | « net/net.gypi ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698