[FileAPI] Clean up WebFileSystemImpl before Blink shutdown

content/child/fileapi/webfilesystem_impl.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/child/fileapi/webfilesystem_impl.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 324 matching lines @@
   if (g_webfilesystem_tls.Pointer()->Get() || !main_thread_loop)
     return g_webfilesystem_tls.Pointer()->Get();
   WebFileSystemImpl* filesystem = new WebFileSystemImpl(main_thread_loop);
   if (WorkerTaskRunner::Instance()->CurrentWorkerId())
     WorkerTaskRunner::Instance()->AddStopObserver(filesystem);
   return filesystem;
 }
 
 void WebFileSystemImpl::DeleteThreadSpecificInstance() {
   DCHECK(!WorkerTaskRunner::Instance()->CurrentWorkerId());
-  if (g_webfilesystem_tls.Pointer()->Get())
+  if (g_webfilesystem_tls.Pointer()->Get()) {
     delete g_webfilesystem_tls.Pointer()->Get();
+    g_webfilesystem_tls.Pointer()->Set(NULL);

[kinuko, 2014/05/08 07:44:09]

Don't we do this in WebFileSystemImpl dtor?

[tzik, 2014/05/08 08:05:30]

Ah, yes, it's done in it. Reverted.

+  }
 }
 
 WebFileSystemImpl::WebFileSystemImpl(base::MessageLoopProxy* main_thread_loop)
     : main_thread_loop_(main_thread_loop),
       next_callbacks_id_(1) {
   g_webfilesystem_tls.Pointer()->Set(this);
 }
 
 WebFileSystemImpl::~WebFileSystemImpl() {
   g_webfilesystem_tls.Pointer()->Set(NULL);
@@ skipping 289 matching lines @@
 WaitableCallbackResults* WebFileSystemImpl::MaybeCreateWaitableResults(
     const WebFileSystemCallbacks& callbacks, int callbacks_id) {
   if (!callbacks.shouldBlockUntilCompletion())
     return NULL;
   WaitableCallbackResults* results = new WaitableCallbackResults();
   waitable_results_[callbacks_id] = results;
   return results;
 }
 
 }  // namespace content