Fix for sync filesystem app crash.

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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_local.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/child/child_thread_impl.h"
 #include "content/child/file_info_util.h"
 #include "content/child/fileapi/file_system_dispatcher.h"
 #include "content/child/fileapi/webfilewriter_impl.h"
 #include "content/common/fileapi/file_system_messages.h"
 #include "storage/common/fileapi/directory_entry.h"
 #include "storage/common/fileapi/file_system_util.h"
 #include "third_party/WebKit/public/platform/WebFileInfo.h"
 #include "third_party/WebKit/public/platform/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/public/web/WebHeap.h"
 #include "url/gurl.h"
 
 using base::MakeTuple;
 using blink::WebFileInfo;
 using blink::WebFileSystemCallbacks;
 using blink::WebFileSystemEntry;
 using blink::WebString;
 using blink::WebURL;
 using blink::WebVector;
 
 namespace content {
 
 class WebFileSystemImpl::WaitableCallbackResults
     : public base::RefCountedThreadSafe<WaitableCallbackResults> {
  public:
   WaitableCallbackResults()
       : results_available_event_(true /* manual_reset */,
                                  false /* initially_signaled */) {}
 
   void AddResultsAndSignal(const base::Closure& results_closure) {
     base::AutoLock lock(lock_);
     results_closures_.push_back(results_closure);
     results_available_event_.Signal();
   }
 
   void WaitAndRun() {
-    {
-      blink::WebHeap::SafePointScope safe_point;
-      results_available_event_.Wait();
-    }
+    results_available_event_.Wait();
     Run();
   }
 
   void Run() {
     std::vector<base::Closure> closures;
     {
       base::AutoLock lock(lock_);
       results_closures_.swap(closures);
       results_available_event_.Reset();
     }
@@ skipping 633 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