Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / mojo / services / network / network_context.cc

diff --git a/src/mojo/services/network/network_context.cc b/src/mojo/services/network/network_context.cc
index a996522..0f94ebd 100644 (file)
--- a/src/mojo/services/network/network_context.cc
+++ b/src/mojo/services/network/network_context.cc
@@ -5,7 +5,6 @@
 #include "mojo/services/network/network_context.h"
 
 #include "base/base_paths.h"
-#include "base/path_service.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
@@ -22,7 +21,10 @@ NetworkContext::NetworkContext(const base::FilePath& base_path) {
 
   net::URLRequestContextBuilder::HttpCacheParams cache_params;
   cache_params.path = base_path.Append(FILE_PATH_LITERAL("Cache"));
-  cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK;
+  // TODO(esprehn): For now store the cache in memory so we can run many shells
+  // in parallel when running tests, otherwise the network services in each
+  // shell will corrupt the disk cache.
+  cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::IN_MEMORY;
   builder.EnableHttpCache(cache_params);
 
   builder.set_file_enabled(true);