Revert 214172 "Revert 214162 "Make Platform::queryStorageUsageAn..."

trunk/src/content/worker/worker_webkitplatformsupport_impl.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 "content/worker/worker_webkitplatformsupport_impl.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/database_util.h"
 #include "content/child/fileapi/webfilesystem_impl.h"
 #include "content/child/indexed_db/proxy_webidbfactory_impl.h"
 #include "content/child/quota_dispatcher.h"
+#include "content/child/quota_message_filter.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/webblobregistry_impl.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/mime_registry_messages.h"
 #include "content/worker/worker_thread.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/WebBlobRegistry.h"
 #include "third_party/WebKit/public/platform/WebFileInfo.h"
@@ skipping 43 matching lines @@
   }
   webkit_glue::PlatformFileInfoToWebFileInfo(file_info, &web_file_info);
   web_file_info.platformPath = path;
   return true;
 }
 
 //------------------------------------------------------------------------------
 
 WorkerWebKitPlatformSupportImpl::WorkerWebKitPlatformSupportImpl(
     ThreadSafeSender* sender,
-    IPC::SyncMessageFilter* sync_message_filter)
+    IPC::SyncMessageFilter* sync_message_filter,
+    QuotaMessageFilter* quota_message_filter)
     : thread_safe_sender_(sender),
       child_thread_loop_(base::MessageLoopProxy::current()),
-      sync_message_filter_(sync_message_filter) {
+      sync_message_filter_(sync_message_filter),
+      quota_message_filter_(quota_message_filter) {
 }
 
 WorkerWebKitPlatformSupportImpl::~WorkerWebKitPlatformSupportImpl() {
 }
 
 WebClipboard* WorkerWebKitPlatformSupportImpl::clipboard() {
   NOTREACHED();
   return NULL;
 }
 
@@ skipping 202 matching lines @@
 WebBlobRegistry* WorkerWebKitPlatformSupportImpl::blobRegistry() {
   if (!blob_registry_.get() && thread_safe_sender_.get())
     blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get()));
   return blob_registry_.get();
 }
 
 void WorkerWebKitPlatformSupportImpl::queryStorageUsageAndQuota(
     const WebKit::WebURL& storage_partition,
     WebKit::WebStorageQuotaType type,
     WebKit::WebStorageQuotaCallbacks* callbacks) {
-  ChildThread::current()->quota_dispatcher()->QueryStorageUsageAndQuota(
-      storage_partition,
-      static_cast<quota::StorageType>(type),
-      QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks));
+  if (!thread_safe_sender_.get() || !quota_message_filter_.get())
+    return;
+  QuotaDispatcher::ThreadSpecificInstance(
+      thread_safe_sender_.get(),
+      quota_message_filter_.get())->QueryStorageUsageAndQuota(
+          storage_partition,
+          static_cast<quota::StorageType>(type),
+          QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks));
 }
 
 }  // namespace content