summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-07 02:36:41 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-07 02:36:41 +0000
commite6f7a0abccc7a0513e1e3654e06f6fc819933ebd (patch)
tree73891cf2c3e158a874fbf9c413b960d2d38f9454
parent9369959b5cf0ff21d0285e260ea30bec4cae83bf (diff)
downloadchromium_src-e6f7a0abccc7a0513e1e3654e06f6fc819933ebd.zip
chromium_src-e6f7a0abccc7a0513e1e3654e06f6fc819933ebd.tar.gz
chromium_src-e6f7a0abccc7a0513e1e3654e06f6fc819933ebd.tar.bz2
aw: Remove kDisableSimpleCache switch
Simple cache has been shipping on android stable for a few releases now. No need to have switch to disable it. BUG=350143 NOTRY=true Review URL: https://codereview.chromium.org/187693009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255502 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--android_webview/browser/net/aw_url_request_context_getter.cc7
-rw-r--r--android_webview/common/aw_switches.cc2
-rw-r--r--android_webview/common/aw_switches.h3
3 files changed, 1 insertions, 11 deletions
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index f75e203..2ee7525 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -191,11 +191,6 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
// TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads.
net::HttpNetworkSession::Params network_session_params;
- net::BackendType cache_type = net::CACHE_BACKEND_SIMPLE;
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableSimpleCache)) {
- cache_type = net::CACHE_BACKEND_BLOCKFILE;
- }
PopulateNetworkSessionParams(url_request_context_.get(),
&network_session_params);
@@ -203,7 +198,7 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
network_session_params,
new net::HttpCache::DefaultBackend(
net::DISK_CACHE,
- cache_type,
+ net::CACHE_BACKEND_SIMPLE,
partition_path_.Append(FILE_PATH_LITERAL("Cache")),
20 * 1024 * 1024, // 20M
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)));
diff --git a/android_webview/common/aw_switches.cc b/android_webview/common/aw_switches.cc
index 317b038f..6b9b2fd5 100644
--- a/android_webview/common/aw_switches.cc
+++ b/android_webview/common/aw_switches.cc
@@ -6,8 +6,6 @@
namespace switches {
-const char kDisableSimpleCache[] = "disable-simple-cache";
-
const char kEnableAccelerated2dCanvas[] = "enable-accelerated-2d-canvas";
} // namespace switches
diff --git a/android_webview/common/aw_switches.h b/android_webview/common/aw_switches.h
index e3572e2..5111a08 100644
--- a/android_webview/common/aw_switches.h
+++ b/android_webview/common/aw_switches.h
@@ -7,9 +7,6 @@
namespace switches {
-// When set, falls back to using the old disk cache.
-extern const char kDisableSimpleCache[];
-
// Explicitly enable accelerated 2d canvas.
// TODO(boliu): Remove this switch once on by default.
extern const char kEnableAccelerated2dCanvas[];