| Index: chrome/browser/profiles/profile_impl_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
|
| index 49b9a266cc34c2c570e158fc385a849d6c0683b0..29806d4694791cabc142847974c1b0ac7b3b7da4 100644
|
| --- a/chrome/browser/profiles/profile_impl_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_impl_io_data.cc
|
| @@ -73,9 +73,7 @@
|
| namespace {
|
|
|
| net::BackendType ChooseCacheBackendType() {
|
| -#if defined(OS_ANDROID)
|
| - return net::CACHE_BACKEND_SIMPLE;
|
| -#else
|
| +#if !defined(OS_ANDROID)
|
| const base::CommandLine& command_line =
|
| *base::CommandLine::ForCurrentProcess();
|
| if (command_line.HasSwitch(switches::kUseSimpleCacheBackend)) {
|
| @@ -88,10 +86,19 @@ net::BackendType ChooseCacheBackendType() {
|
| }
|
| const std::string experiment_name =
|
| base::FieldTrialList::FindFullName("SimpleCacheTrial");
|
| - if (experiment_name == "ExperimentYes" ||
|
| - experiment_name == "ExperimentYes2") {
|
| + if (base::StartsWith(experiment_name, "Disable",
|
| + base::CompareCase::INSENSITIVE_ASCII)) {
|
| + return net::CACHE_BACKEND_BLOCKFILE;
|
| + }
|
| + if (base::StartsWith(experiment_name, "ExperimentYes",
|
| + base::CompareCase::INSENSITIVE_ASCII)) {
|
| return net::CACHE_BACKEND_SIMPLE;
|
| }
|
| +#endif // #if !defined(OS_ANDROID)
|
| +
|
| +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
|
| + return net::CACHE_BACKEND_SIMPLE;
|
| +#else
|
| return net::CACHE_BACKEND_BLOCKFILE;
|
| #endif
|
| }
|
|
|