summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
authorachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 22:19:00 +0000
committerachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 22:19:00 +0000
commitabb26096d64316448c4203de724e02a3258a2dce (patch)
treee420ffe07316fe21161f0245dedfb42c5fd4afc7 /net/proxy
parentaab8b552b9901487f0288169f4b05d7cb2d14d11 (diff)
downloadchromium_src-abb26096d64316448c4203de724e02a3258a2dce.zip
chromium_src-abb26096d64316448c4203de724e02a3258a2dce.tar.gz
chromium_src-abb26096d64316448c4203de724e02a3258a2dce.tar.bz2
Restrict file protocol on chromeos to certain whitelisted directories. Disable this for tests.
BUG=chromium-os:3412 TEST=Access file: directories on chromeos. browser, ui, interactive ui and unit tests should continue to pass. Review URL: http://codereview.chromium.org/4160003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/proxy_script_fetcher_impl_unittest.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index 2642f4d..4734997 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -4,6 +4,8 @@
#include "net/proxy/proxy_script_fetcher_impl.h"
+#include <string>
+
#include "base/file_path.h"
#include "base/compiler_specific.h"
#include "base/path_service.h"
@@ -73,6 +75,10 @@ class ProxyScriptFetcherImplTest : public PlatformTest {
: test_server_(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)) {
}
+ static void SetUpTestCase() {
+ URLRequest::AllowFileAccess();
+ }
+
protected:
net::TestServer test_server_;
};