1 files changed, 9 insertions, 0 deletions
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index 144db959..a4de2c8 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -86,6 +86,10 @@ WorkerWebKitPlatformSupportImpl::WorkerWebKitPlatformSupportImpl(
 }
 
 WorkerWebKitPlatformSupportImpl::~WorkerWebKitPlatformSupportImpl() {
+#ifdef USE_THREADLOCAL_WEBFILESYSTEM
+  // TODO(kinuko): Delete this ifdef after blink side switch's over.
+  WebFileSystemImpl::DeleteThreadSpecificInstance();
+#endif
 }
 
 WebClipboard* WorkerWebKitPlatformSupportImpl::clipboard() {
@@ -98,9 +102,14 @@ WebMimeRegistry* WorkerWebKitPlatformSupportImpl::mimeRegistry() {
 }
 
 WebFileSystem* WorkerWebKitPlatformSupportImpl::fileSystem() {
+#ifdef USE_THREADLOCAL_WEBFILESYSTEM
+  // TODO(kinuko): Delete this ifdef after blink side switch's over.
+  return WebFileSystemImpl::ThreadSpecificInstance(child_thread_loop_.get());
+#else
   if (!web_file_system_)
     web_file_system_.reset(new WebFileSystemImpl(child_thread_loop_.get()));
   return web_file_system_.get();
+#endif
 }
 
 WebFileUtilities* WorkerWebKitPlatformSupportImpl::fileUtilities() {