Remove PPB_Flash_NetConnector and ENABLE_FLAPPER_HACKS.

content/renderer/pepper/pepper_plugin_delegate_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/renderer/pepper/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <cstddef>
 #include <map>
 #include <queue>
@@ skipping 40 matching lines @@
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "content/renderer/renderer_clipboard_client.h"
 #include "content/renderer/webplugin_delegate_proxy.h"
 #include "ipc/ipc_channel_handle.h"
 #include "media/video/capture/video_capture_proxy.h"
 #include "ppapi/c/dev/pp_video_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash.h"
-#include "ppapi/c/private/ppb_flash_net_connector.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/platform_file.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_tcp_server_socket_private_api.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserCompletion.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/gfx/size.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/ppapi/file_path.h"
 #include "webkit/plugins/ppapi/ppb_file_io_impl.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
-#include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
 #include "webkit/plugins/ppapi/ppb_tcp_server_socket_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_tcp_socket_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_udp_socket_private_impl.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using WebKit::WebView;
 using WebKit::WebFrame;
 
 namespace {
@@ skipping 819 matching lines @@
     const GURL& url, FilePath* platform_path) {
   RenderThreadImpl::current()->Send(new FileSystemHostMsg_SyncGetPlatformPath(
       url, platform_path));
 }
 
 scoped_refptr<base::MessageLoopProxy>
 PepperPluginDelegateImpl::GetFileThreadMessageLoopProxy() {
   return RenderThreadImpl::current()->GetFileThreadMessageLoopProxy();
 }
 
-int32_t PepperPluginDelegateImpl::ConnectTcp(
-    webkit::ppapi::PPB_Flash_NetConnector_Impl* connector,
-    const char* host,
-    uint16_t port) {
-  int request_id = pending_connect_tcps_.Add(
-      new scoped_refptr<webkit::ppapi::PPB_Flash_NetConnector_Impl>(connector));
-  IPC::Message* msg =
-      new PepperMsg_ConnectTcp(render_view_->routing_id(),
-                               request_id,
-                               std::string(host),
-                               port);
-  if (!render_view_->Send(msg)) {
-    pending_connect_tcps_.Remove(request_id);
-    return PP_ERROR_FAILED;
-  }
-
-  return PP_OK_COMPLETIONPENDING;
-}
-
-int32_t PepperPluginDelegateImpl::ConnectTcpAddress(
-    webkit::ppapi::PPB_Flash_NetConnector_Impl* connector,
-    const struct PP_NetAddress_Private* addr) {
-  int request_id = pending_connect_tcps_.Add(
-      new scoped_refptr<webkit::ppapi::PPB_Flash_NetConnector_Impl>(connector));
-  IPC::Message* msg =
-      new PepperMsg_ConnectTcpAddress(render_view_->routing_id(),
-                                      request_id,
-                                      *addr);
-  if (!render_view_->Send(msg)) {
-    pending_connect_tcps_.Remove(request_id);
-    return PP_ERROR_FAILED;
-  }
-
-  return PP_OK_COMPLETIONPENDING;
-}
-
-void PepperPluginDelegateImpl::OnConnectTcpACK(
-    int request_id,
-    base::PlatformFile socket,
-    const PP_NetAddress_Private& local_addr,
-    const PP_NetAddress_Private& remote_addr) {
-  scoped_refptr<webkit::ppapi::PPB_Flash_NetConnector_Impl> connector =
-      *pending_connect_tcps_.Lookup(request_id);
-  pending_connect_tcps_.Remove(request_id);
-
-  connector->CompleteConnectTcp(socket, local_addr, remote_addr);
-}
-
 uint32 PepperPluginDelegateImpl::TCPSocketCreate() {
   uint32 socket_id = 0;
   render_view_->Send(new PpapiHostMsg_PPBTCPSocket_Create(
       render_view_->routing_id(), 0, &socket_id));
   return socket_id;
 }
 
 void PepperPluginDelegateImpl::TCPSocketConnect(
     webkit::ppapi::PPB_TCPSocket_Private_Impl* socket,
     uint32 socket_id,
@@ skipping 664 matching lines @@
     render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(target);
     delete target;
     mouse_lock_instances_.erase(it);
   }
 }
 
 webkit_glue::ClipboardClient*
     PepperPluginDelegateImpl::CreateClipboardClient() const {
   return new RendererClipboardClient;
 }