summaryrefslogtreecommitdiff
path: root/chromium/content/browser/service_worker/service_worker_database.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/browser/service_worker/service_worker_database.cc')
-rw-r--r--chromium/content/browser/service_worker/service_worker_database.cc15
1 files changed, 5 insertions, 10 deletions
diff --git a/chromium/content/browser/service_worker/service_worker_database.cc b/chromium/content/browser/service_worker/service_worker_database.cc
index 746351acfb8..c34711b2eb7 100644
--- a/chromium/content/browser/service_worker/service_worker_database.cc
+++ b/chromium/content/browser/service_worker/service_worker_database.cc
@@ -1257,7 +1257,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::LazyOpen(
leveldb_env::Options options;
options.create_if_missing = create_if_missing;
if (IsDatabaseInMemory()) {
- env_.reset(leveldb_chrome::NewMemEnv(leveldb::Env::Default()));
+ env_ = leveldb_chrome::NewMemEnv("service-worker");
options.env = env_.get();
} else {
options.env = g_service_worker_env.Pointer();
@@ -1466,15 +1466,10 @@ void ServiceWorkerDatabase::WriteRegistrationDataInBatch(
for (uint32_t feature : registration.used_features)
data.add_used_features(feature);
- // TODO(https://crbug.com/675540): Remove the the command line check and
- // always set to data when shipping the updateViaCache flag to stable.
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableExperimentalWebPlatformFeatures)) {
- data.set_update_via_cache(
- static_cast<
- ServiceWorkerRegistrationData_ServiceWorkerUpdateViaCacheType>(
- registration.update_via_cache));
- }
+ data.set_update_via_cache(
+ static_cast<
+ ServiceWorkerRegistrationData_ServiceWorkerUpdateViaCacheType>(
+ registration.update_via_cache));
std::string value;
bool success = data.SerializeToString(&value);