Remove PPB_Flash_NetConnector and ENABLE_FLAPPER_HACKS.

PPB_Flash_NetConnector has been superseded by less hacky and more general
interfaces. ENABLE_FLAPPER_HACKS only enabled PPB_Flash_NetConnector.

TEST=builds (and still passes PPAPI tests)
TBR=darin@chromium.org

Review URL: http://codereview.chromium.org/9836131

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

4 files changed, 0 insertions, 110 deletions

diff --git a/ppapi/thunk/ppb_flash_net_connector_api.h b/ppapi/thunk/ppb_flash_net_connector_api.h
deleted file mode 100644
index 5bf0198..0000000
--- a/ppapi/thunk/ppb_flash_net_connector_api.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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.
-
-#ifndef PPAPI_THUNK_PPB_FLASH_NET_CONNECTOR_API_H_
-#define PPAPI_THUNK_PPB_FLASH_NET_CONNECTOR_API_H_
-
-#include "ppapi/c/private/ppb_flash_net_connector.h"
-
-namespace ppapi {
-namespace thunk {
-
-class PPB_Flash_NetConnector_API {
- public:
-  virtual ~PPB_Flash_NetConnector_API() {}
-
-  virtual int32_t ConnectTcp(const char* host,
-                             uint16_t port,
-                             PP_FileHandle* socket_out,
-                             PP_NetAddress_Private* local_addr_out,
-                             PP_NetAddress_Private* remote_addr_out,
-                             PP_CompletionCallback callback) = 0;
-  virtual int32_t ConnectTcpAddress(const PP_NetAddress_Private* addr,
-                                    PP_FileHandle* socket_out,
-                                    PP_NetAddress_Private* local_addr_out,
-                                    PP_NetAddress_Private* remote_addr_out,
-                                    PP_CompletionCallback callback) = 0;
-};
-
-}  // namespace thunk
-}  // namespace ppapi
-
-#endif  // PPAPI_THUNK_PPB_FLASH_NET_CONNECTOR_API_H_
diff --git a/ppapi/thunk/ppb_flash_net_connector_thunk.cc b/ppapi/thunk/ppb_flash_net_connector_thunk.cc
deleted file mode 100644
index 0be5043..0000000
--- a/ppapi/thunk/ppb_flash_net_connector_thunk.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// 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 "ppapi/c/private/ppb_flash_net_connector.h"
-#include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/thunk.h"
-#include "ppapi/thunk/ppb_flash_net_connector_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-typedef EnterResource<PPB_Flash_NetConnector_API> EnterNetConnector;
-
-PP_Resource Create(PP_Instance instance) {
-  EnterResourceCreation enter(instance);
-  if (enter.failed())
-    return 0;
-  return enter.functions()->CreateFlashNetConnector(instance);
-}
-
-PP_Bool IsFlashNetConnector(PP_Resource resource) {
-  EnterNetConnector enter(resource, false);
-  return PP_FromBool(enter.succeeded());
-}
-
-int32_t ConnectTcp(PP_Resource resource,
-                   const char* host,
-                   uint16_t port,
-                   PP_FileHandle* socket_out,
-                   PP_NetAddress_Private* local_addr_out,
-                   PP_NetAddress_Private* remote_addr_out,
-                   PP_CompletionCallback callback) {
-  EnterNetConnector enter(resource, callback, true);
-  if (enter.failed())
-    return enter.retval();
-  return enter.SetResult(enter.object()->ConnectTcp(
-      host, port, socket_out, local_addr_out, remote_addr_out, callback));
-}
-
-int32_t ConnectTcpAddress(PP_Resource resource,
-                          const PP_NetAddress_Private* addr,
-                          PP_FileHandle* socket_out,
-                          PP_NetAddress_Private* local_addr_out,
-                          PP_NetAddress_Private* remote_addr_out,
-                          PP_CompletionCallback callback) {
-  EnterNetConnector enter(resource, callback, true);
-  if (enter.failed())
-    return enter.retval();
-  return enter.SetResult(enter.object()->ConnectTcpAddress(
-      addr, socket_out, local_addr_out, remote_addr_out, callback));
-}
-
-const PPB_Flash_NetConnector g_ppb_flash_net_connector_thunk = {
-  &Create,
-  &IsFlashNetConnector,
-  &ConnectTcp,
-  &ConnectTcpAddress
-};
-
-}  // namespace
-
-const PPB_Flash_NetConnector* GetPPB_Flash_NetConnector_0_2_Thunk() {
-  return &g_ppb_flash_net_connector_thunk;
-}
-
-}  // namespace thunk
-}  // namespace ppapi
diff --git a/ppapi/thunk/resource_creation_api.h b/ppapi/thunk/resource_creation_api.h
index 536c967..5a6ccb5 100644
--- a/ppapi/thunk/resource_creation_api.h
+++ b/ppapi/thunk/resource_creation_api.h
@@ -74,7 +74,6 @@ class ResourceCreationAPI {
   virtual PP_Resource CreateFlashMenu(PP_Instance instance,
                                       const PP_Flash_Menu* menu_data) = 0;
   virtual PP_Resource CreateFlashMessageLoop(PP_Instance instance) = 0;
-  virtual PP_Resource CreateFlashNetConnector(PP_Instance instance) = 0;
   virtual PP_Resource CreateGraphics2D(PP_Instance instance,
                                        const PP_Size& size,
                                        PP_Bool is_always_opaque) = 0;
diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h
index 37698b6..e98e71b 100644
--- a/ppapi/thunk/thunk.h
+++ b/ppapi/thunk/thunk.h
@@ -9,7 +9,6 @@
 #include "ppapi/c/private/ppb_flash_clipboard.h"
 #include "ppapi/c/private/ppb_flash_menu.h"
 #include "ppapi/c/private/ppb_flash_message_loop.h"
-#include "ppapi/c/private/ppb_flash_net_connector.h"
 #include "ppapi/c/private/ppb_flash_fullscreen.h"
 #include "ppapi/c/private/ppb_host_resolver_private.h"
 #include "ppapi/c/private/ppb_instance_private.h"
@@ -67,8 +66,6 @@ PPAPI_THUNK_EXPORT const PPB_Flash_Clipboard_3_0*
 PPAPI_THUNK_EXPORT const PPB_Flash_Menu_0_2* GetPPB_Flash_Menu_0_2_Thunk();
 PPAPI_THUNK_EXPORT const PPB_Flash_MessageLoop_0_1*
     GetPPB_Flash_MessageLoop_0_1_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector_0_2*
-    GetPPB_Flash_NetConnector_0_2_Thunk();
 PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted_1_0*
     GetPPB_Graphics3DTrusted_1_0_Thunk();
 PPAPI_THUNK_EXPORT const PPB_HostResolver_Private_0_1*