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

trunk/src/content/renderer/renderer_webkitplatformsupport_impl.cc

Index: trunk/src/content/renderer/renderer_webkitplatformsupport_impl.cc
===================================================================
--- trunk/src/content/renderer/renderer_webkitplatformsupport_impl.cc	(revision 214172)
+++ trunk/src/content/renderer/renderer_webkitplatformsupport_impl.cc	(working copy)
@@ -19,6 +19,7 @@
 #include "content/child/indexed_db/proxy_webidbfactory_impl.h"
 #include "content/child/npapi/npobject_util.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"
@@ -241,6 +242,7 @@
   if (ChildThread::current()) {
     sync_message_filter_ = ChildThread::current()->sync_message_filter();
     thread_safe_sender_ = ChildThread::current()->thread_safe_sender();
+    quota_message_filter_ = ChildThread::current()->quota_message_filter();
   }
 }
 
@@ -1148,10 +1150,14 @@
     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