Move URLLoader, URLRequestInfo, and URLResponseInfo out of the dev directory...

webkit/glue/plugins/pepper_plugin_module.cc

 // Copyright (c) 2010 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/glue/plugins/pepper_plugin_module.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "ppapi/c/dev/ppb_buffer_dev.h"
 #include "ppapi/c/dev/ppb_char_set_dev.h"
 #include "ppapi/c/dev/ppb_cursor_control_dev.h"
 #include "ppapi/c/dev/ppb_directory_reader_dev.h"
 #include "ppapi/c/dev/ppb_file_io_dev.h"
 #include "ppapi/c/dev/ppb_file_io_trusted_dev.h"
 #include "ppapi/c/dev/ppb_file_system_dev.h"
 #include "ppapi/c/dev/ppb_find_dev.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/dev/ppb_fullscreen_dev.h"
 #include "ppapi/c/dev/ppb_graphics_3d_dev.h"
 #include "ppapi/c/dev/ppb_opengles_dev.h"
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/dev/ppb_transport_dev.h"
-#include "ppapi/c/dev/ppb_url_loader_dev.h"
-#include "ppapi/c/dev/ppb_url_loader_trusted_dev.h"
-#include "ppapi/c/dev/ppb_url_request_info_dev.h"
-#include "ppapi/c/dev/ppb_url_response_info_dev.h"
 #include "ppapi/c/dev/ppb_url_util_dev.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "ppapi/c/dev/ppb_widget_dev.h"
 #include "ppapi/c/dev/ppb_zoom_dev.h"
-#include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_class.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/c/ppb_instance.h"
+#include "ppapi/c/ppb_url_loader.h"
+#include "ppapi/c/ppb_url_request_info.h"
+#include "ppapi/c/ppb_url_response_info.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/c/ppp_instance.h"
+#include "ppapi/c/trusted/ppb_image_data_trusted.h"
+#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "webkit/glue/plugins/pepper_audio.h"
 #include "webkit/glue/plugins/pepper_buffer.h"
 #include "webkit/glue/plugins/pepper_common.h"
 #include "webkit/glue/plugins/pepper_char_set.h"
 #include "webkit/glue/plugins/pepper_class.h"
 #include "webkit/glue/plugins/pepper_cursor_control.h"
 #include "webkit/glue/plugins/pepper_directory_reader.h"
 #include "webkit/glue/plugins/pepper_file_chooser.h"
@@ skipping 165 matching lines @@
   if (strcmp(name, PPB_GRAPHICS_2D_INTERFACE) == 0)
     return Graphics2D::GetInterface();
 #ifdef ENABLE_GPU
   if (strcmp(name, PPB_GRAPHICS_3D_DEV_INTERFACE) == 0)
     return Graphics3D::GetInterface();
   if (strcmp(name, PPB_OPENGLES_DEV_INTERFACE) == 0)
     return Graphics3D::GetOpenGLESInterface();
 #endif  // ENABLE_GPU
   if (strcmp(name, PPB_TRANSPORT_DEV_INTERFACE) == 0)
     return Transport::GetInterface();
-  if (strcmp(name, PPB_URLLOADER_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_URLLOADER_INTERFACE) == 0)
     return URLLoader::GetInterface();
-  if (strcmp(name, PPB_URLLOADERTRUSTED_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0)
     return URLLoader::GetTrustedInterface();
-  if (strcmp(name, PPB_URLREQUESTINFO_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_URLREQUESTINFO_INTERFACE) == 0)
     return URLRequestInfo::GetInterface();
-  if (strcmp(name, PPB_URLRESPONSEINFO_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_URLRESPONSEINFO_INTERFACE) == 0)
     return URLResponseInfo::GetInterface();
   if (strcmp(name, PPB_BUFFER_DEV_INTERFACE) == 0)
     return Buffer::GetInterface();
   if (strcmp(name, PPB_FILEREF_DEV_INTERFACE) == 0)
     return FileRef::GetInterface();
   if (strcmp(name, PPB_FILEIO_DEV_INTERFACE) == 0)
     return FileIO::GetInterface();
   if (strcmp(name, PPB_FILEIOTRUSTED_DEV_INTERFACE) == 0)
     return FileIO::GetTrustedInterface();
   if (strcmp(name, PPB_FILESYSTEM_DEV_INTERFACE) == 0)
@@ skipping 291 matching lines @@
   live_plugin_objects_.insert(plugin_object);
 }
 
 void PluginModule::RemovePluginObject(PluginObject* plugin_object) {
   // Don't actually verify that the object is in the set since during module
   // deletion we'll be in the process of freeing them.
   live_plugin_objects_.erase(plugin_object);
 }
 
 }  // namespace pepper