Move creation of BrowserContext objects that live in content to content, instead of depending on th…

webkit/fileapi/file_system_context.cc

 // Copyright (c) 2012 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 "webkit/fileapi/file_system_context.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "googleurl/src/gurl.h"
@@ skipping 123 matching lines @@
 FileSystemContext::sandbox_provider() const {
   return sandbox_provider_.get();
 }
 
 ExternalFileSystemMountPointProvider*
 FileSystemContext::external_provider() const {
   return external_provider_.get();
 }
 
 void FileSystemContext::DeleteOnCorrectThread() const {
-  if (!io_message_loop_->BelongsToCurrentThread()) {
-    io_message_loop_->DeleteSoon(FROM_HERE, this);
+  if (!io_message_loop_->BelongsToCurrentThread() && 
+      io_message_loop_->DeleteSoon(FROM_HERE, this)) {
     return;
   }
   delete this;
 }
 
 void FileSystemContext::OpenFileSystem(
     const GURL& origin_url,
     FileSystemType type,
     bool create,
     OpenFileSystemCallback callback) {
@@ skipping 24 matching lines @@
     return NULL;
   FileSystemMountPointProvider* mount_point_provider =
       GetMountPointProvider(file_system_type);
   if (!mount_point_provider)
     return NULL;
   return mount_point_provider->CreateFileSystemOperation(
       origin_url, file_system_type, file_path, file_proxy, this);
 }
 
 }  // namespace fileapi