Cleanup: Make quota dispatcher code independent from WebKit types

content/renderer/render_view.cc

 // Copyright (c) 2011 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/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 21 matching lines @@
 #include "content/common/file_system/file_system_dispatcher.h"
 #include "content/common/file_system/webfilesystem_callback_dispatcher.h"
 #include "content/common/json_value_serializer.h"
 #include "content/common/notification_service.h"
 #include "content/common/pepper_messages.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "content/common/quota_dispatcher.h"
 #include "content/common/renderer_preferences.h"
 #include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
+#include "content/common/web_quota_dispatcher_callback.h"
 #include "content/renderer/content_renderer_client.h"
 #include "content/renderer/device_orientation_dispatcher.h"
 #include "content/renderer/external_popup_menu.h"
 #include "content/renderer/geolocation_dispatcher.h"
 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/renderer/load_progress_tracker.h"
 #include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/media/audio_renderer_impl.h"
 #include "content/renderer/navigation_state.h"
 #include "content/renderer/notification_provider.h"
@@ skipping 2798 matching lines @@
     WebStorageQuotaType type,
     WebStorageQuotaCallbacks* callbacks) {
   DCHECK(frame);
   WebSecurityOrigin origin = frame->document().securityOrigin();
   if (origin.isEmpty()) {
     // Uninitialized document?
     callbacks->didFail(WebKit::WebStorageQuotaErrorAbort);
     return;
   }
   ChildThread::current()->quota_dispatcher()->QueryStorageUsageAndQuota(
-      GURL(origin.toString()), type, callbacks);
+      GURL(origin.toString()),
+      static_cast<quota::StorageType>(type),
+      new WebQuotaDispatcherCallback(callbacks));
 }
 
 void RenderView::requestStorageQuota(
     WebFrame* frame,
     WebStorageQuotaType type,
     unsigned long long requested_size,
     WebStorageQuotaCallbacks* callbacks) {
   DCHECK(frame);
   WebSecurityOrigin origin = frame->document().securityOrigin();
   if (origin.isEmpty()) {
     // Uninitialized document?
     callbacks->didFail(WebKit::WebStorageQuotaErrorAbort);
     return;
   }
   ChildThread::current()->quota_dispatcher()->RequestStorageQuota(
-      routing_id(), GURL(origin.toString()), type, requested_size, callbacks);
+      routing_id(), GURL(origin.toString()),
+      static_cast<quota::StorageType>(type), requested_size,
+      new WebQuotaDispatcherCallback(callbacks));
 }
 
 // webkit_glue::WebPluginPageDelegate -----------------------------------------
 
 webkit::npapi::WebPluginDelegate* RenderView::CreatePluginDelegate(
     const FilePath& file_path,
     const std::string& mime_type) {
   if (!PluginChannelHost::IsListening())
     return NULL;
 
@@ skipping 1412 matching lines @@
 }
 #endif
 
 void RenderView::OnContextMenuClosed(
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }