Migrate data from old localstorage format to new format.

content/browser/dom_storage/dom_storage_context_wrapper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 65 matching lines @@
                             base::Owned(infos)));
 }
 
 }  // namespace
 
 DOMStorageContextWrapper::DOMStorageContextWrapper(
     service_manager::Connector* connector,
     const base::FilePath& profile_path,
     const base::FilePath& local_partition_path,
     storage::SpecialStoragePolicy* special_storage_policy) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kMojoLocalStorage)) {
-    base::FilePath storage_dir;
-    if (!profile_path.empty())
-      storage_dir = local_partition_path.AppendASCII(kLocalStorageDirectory);
-    // TODO(michaeln): Enable writing to disk when db is versioned,
-    // for now using an empty subdirectory to use an in-memory db.
-    // subdirectory_(subdirectory),
-    mojo_state_.reset(new LocalStorageContextMojo(
-        connector, base::FilePath() /* storage_dir */));
-  }
-
   base::FilePath data_path;
   if (!profile_path.empty())
     data_path = profile_path.Append(local_partition_path);
 
   scoped_refptr<base::SequencedTaskRunner> primary_sequence;
   scoped_refptr<base::SequencedTaskRunner> commit_sequence;
   if (GetContentClient()->browser()->ShouldRedirectDOMStorageTaskRunner()) {
     // TaskPriority::USER_BLOCKING as an experiment because this is currently
     // believed to be blocking synchronous IPCs from the renderers:
     // http://crbug.com/665588 (yes we want to fix that bug, but are taking it
@@ skipping 19 matching lines @@
 
   context_ = new DOMStorageContextImpl(
       data_path.empty() ? data_path
                         : data_path.AppendASCII(kLocalStorageDirectory),
       data_path.empty() ? data_path
                         : data_path.AppendASCII(kSessionStorageDirectory),
       special_storage_policy,
       new DOMStorageWorkerPoolTaskRunner(std::move(primary_sequence),
                                          std::move(commit_sequence)));
 
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kMojoLocalStorage)) {
+    base::FilePath storage_dir;
+    if (!profile_path.empty())
+      storage_dir = local_partition_path.AppendASCII(kLocalStorageDirectory);
+    // TODO(michaeln): Enable writing to disk when db is versioned,
+    // for now using an empty subdirectory to use an in-memory db.
+    // subdirectory_(subdirectory),
+    mojo_state_.reset(new LocalStorageContextMojo(
+        connector, context_->task_runner(),
+        data_path.empty() ? data_path
+                          : data_path.AppendASCII(kLocalStorageDirectory),
+        base::FilePath() /* storage_dir */));
+  }
+
   if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) {
     base::MemoryCoordinatorClientRegistry::GetInstance()->Register(this);
   } else {
     memory_pressure_listener_.reset(new base::MemoryPressureListener(
         base::Bind(&DOMStorageContextWrapper::OnMemoryPressure, this)));
   }
 }
 
 DOMStorageContextWrapper::~DOMStorageContextWrapper() {}
 
@@ skipping 158 matching lines @@
     GetLocalStorageUsageCallback callback,
     std::vector<LocalStorageUsageInfo> usage) {
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE,
       base::Bind(&GetLocalStorageUsageHelper, base::Passed(&usage),
                  base::RetainedRef(base::ThreadTaskRunnerHandle::Get()),
                  base::RetainedRef(context_), callback));
 }
 
 }  // namespace content