Revert 189913 "Proxy queryUsageAndQuota from worker process"

Breaks stuff:
http://build.chromium.org/p/chromium.memory/builders/Linux%20ASAN%20Tests%20%282%29/builds/7567/steps/content_unittests/logs/stdio

[ RUN      ] DatabaseTrackerTest.DatabaseTrackerQuotaIntegration
ASAN:SIGSEGV
=================================================================
==8773== ERROR: AddressSanitizer: SEGV on unknown address 0x000000000000 (pc 0x00000594b426 sp 0x7fff3276b160 bp 0x7fff3276b230 T0)
AddressSanitizer can not provide additional info.
    #0 0x594b425 in webkit_database::DatabaseQuotaClient::~DatabaseQuotaClient() /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../webkit/database/database_quota_client.cc:104:0
    #1 0x594b35d in webkit_database::DatabaseQuotaClient::~DatabaseQuotaClient() /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../webkit/database/database_quota_client.cc:103:0
    #2 0x1363008 in SimulateQuotaManagerDestroyed /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../webkit/database/database_tracker_unittest.cc:128:0
    #3 0x1363008 in webkit_database::DatabaseTracker_TestHelper_Test::DatabaseTrackerQuotaIntegration() /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../webkit/database/database_tracker_unittest.cc:530:0
    #4 0x31f9527 in testing::Test::Run() /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../testing/gtest/src/gtest.cc:2067:0
    #5 0x31fb075 in testing::TestInfo::Run() /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../testing/gtest/src/gtest.cc:2244:0
    #6 0x31fbecc in testing::TestCase::Run() /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../testing/gtest/src/gtest.cc:2351:0
    #7 0x3208d80 in testing::internal::UnitTestImpl::RunAllTests() /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../testing/gtest/src/gtest.cc:4177:0
    #8 0x3208310 in impl /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../testing/gtest/src/gtest.cc:2051:0
    #9 0x3208310 in testing::UnitTest::Run() /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../testing/gtest/src/gtest.cc:3810:0
    #10 0x7014bea in base::TestSuite::Run() /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../base/test/test_suite.cc:167:0
    #11 0x104dec6 in main /b/build/slave/Linux_ASAN_Builder/build/src/out/Release/../../content/test/run_all_unittests.cc:9:0
    #12 0x7f32cba7b76c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226
    #13 0x453e24 in _start ??:0
==8773== ABORTING


> Proxy queryUsageAndQuota from worker process
> 
> BUG=88490
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=189731
> 
> Review URL: https://codereview.chromium.org/12948002

TBR=alecflett@chromium.org
Review URL: https://codereview.chromium.org/13033003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189918 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 13 deletions

diff --git a/content/worker/websharedworkerclient_proxy.cc b/content/worker/websharedworkerclient_proxy.cc
index 049361e..01913cb 100644
--- a/content/worker/websharedworkerclient_proxy.cc
+++ b/content/worker/websharedworkerclient_proxy.cc
@@ -9,7 +9,6 @@
 #include "base/message_loop.h"
 #include "content/common/fileapi/file_system_dispatcher.h"
 #include "content/common/fileapi/webfilesystem_callback_dispatcher.h"
-#include "content/common/quota_dispatcher.h"
 #include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
 #include "content/public/common/content_switches.h"
@@ -178,14 +177,6 @@ bool WebSharedWorkerClientProxy::allowIndexedDB(const WebKit::WebString& name) {
   return result;
 }
 
-void WebSharedWorkerClientProxy::queryUsageAndQuota(
-    WebKit::WebStorageQuotaType type,
-    WebKit::WebStorageQuotaCallbacks* callbacks) {
-  ChildThread::current()->quota_dispatcher()->QueryStorageUsageAndQuota(
-      stub_->url().GetOrigin(), static_cast<quota::StorageType>(type),
-      QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks));
-}
-
 void WebSharedWorkerClientProxy::dispatchDevToolsMessage(
     const WebString& message) {
   if (devtools_agent_)
diff --git a/content/worker/websharedworkerclient_proxy.h b/content/worker/websharedworkerclient_proxy.h
index d560628..bc26a29 100644
--- a/content/worker/websharedworkerclient_proxy.h
+++ b/content/worker/websharedworkerclient_proxy.h
@@ -11,8 +11,6 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerClient.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaCallbacks.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaType.h"
 
 namespace WebKit {
 class WebApplicationCacheHost;
@@ -83,8 +81,6 @@ class WebSharedWorkerClientProxy : public WebKit::WebSharedWorkerClient {
                               bool create,
                               WebKit::WebFileSystemCallbacks* callbacks);
   virtual bool allowIndexedDB(const WebKit::WebString&);
-  virtual void queryUsageAndQuota(WebKit::WebStorageQuotaType,
-                                  WebKit::WebStorageQuotaCallbacks*);
   virtual void dispatchDevToolsMessage(const WebKit::WebString&);
   virtual void saveDevToolsAgentState(const WebKit::WebString&);