diff options
| author | pasko@google.com <pasko@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 12:37:44 +0000 |
|---|---|---|
| committer | pasko@google.com <pasko@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 12:37:44 +0000 |
| commit | fa1d08ea2a17c5555eedbaa862d8ef68dbea8ba5 (patch) | |
| tree | 3f648bf01127e44b2c5bcc345d7be4129e442b62 /webkit/tools/test_shell | |
| parent | b95e72678f32d52db1c9fbc696fd4f3df825f060 (diff) | |
| download | chromium_src-fa1d08ea2a17c5555eedbaa862d8ef68dbea8ba5.zip chromium_src-fa1d08ea2a17c5555eedbaa862d8ef68dbea8ba5.tar.gz chromium_src-fa1d08ea2a17c5555eedbaa862d8ef68dbea8ba5.tar.bz2 | |
Override server-side simple-cache trial with commandline switches.
FIXING broken about:flags for simple cache on Android.
Until recently we used a trick to avoid dedicated global settings in
net::disk_cache other than the objects belonging to the infrastructure of the
trials. The commandline flag would change the experiment group on the chromium
side, while one the net/ side we would check which group we belong to.
Later we decided to switch to the server-controlled experiments. This went into
a conflict with our approach: the server-controlled experiment would override
the settings set by the command-line option. This is unfortunate.
Stevet@ suggests that there are plans to avoid overriding the experiment groups
by the server config, but in the meantime the trick stops working.
Solve this by adding backend type enum provided at backend instantiation.
TBR=jam@chromium.org
BUG=239461
Review URL: https://chromiumcodereview.appspot.com/14828004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_request_context.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index cc6956f..af3df4e 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -10,6 +10,7 @@ #include "base/files/file_path.h" #include "base/thread_task_runner_handle.h" #include "base/threading/worker_pool.h" +#include "net/base/cache_type.h" #include "net/cert/cert_verifier.h" #include "net/cookies/cookie_monster.h" #include "net/dns/host_resolver.h" @@ -96,7 +97,8 @@ void TestShellRequestContext::Init( net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend( cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE, - cache_path, 0, SimpleResourceLoaderBridge::GetCacheThread()); + net::CACHE_BACKEND_DEFAULT, cache_path, 0, + SimpleResourceLoaderBridge::GetCacheThread()); net::HttpNetworkSession::Params network_session_params; network_session_params.host_resolver = host_resolver(); |