Remove GTalk Pepper interfaces and related code.

Remove obsolete private Pepper interface private/ppb_talk_private.h,
associated Pepper plumbing code, strings, and chrome::PepperTalkHost.

These are no longer needed as support for Pepper GTalk has been
dropped.

BUG=392002
TEST=browser_tests

Review URL: https://codereview.chromium.org/1088183003

Cr-Commit-Position: refs/heads/master@{#325310}

24 files changed, 0 insertions, 985 deletions

diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn
index 182c671..726577e 100644
--- a/ppapi/BUILD.gn
+++ b/ppapi/BUILD.gn
@@ -66,7 +66,6 @@ test("ppapi_unittests") {
     "proxy/printing_resource_unittest.cc",
     "proxy/raw_var_data_unittest.cc",
     "proxy/serialized_var_unittest.cc",
-    "proxy/talk_resource_unittest.cc",
     "proxy/tracked_callback_unittest.cc",
     "proxy/video_decoder_resource_unittest.cc",
     "proxy/video_encoder_resource_unittest.cc",
diff --git a/ppapi/api/private/ppb_talk_private.idl b/ppapi/api/private/ppb_talk_private.idl
deleted file mode 100644
index 548ac1e..0000000
--- a/ppapi/api/private/ppb_talk_private.idl
+++ /dev/null
@@ -1,142 +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.
- */
-
-/**
- * This file contains the <code>PPB_Talk_Private</code> interface.
- */
-label Chrome {
-  M19 = 1.0,
-  M29 = 2.0
-};
-
-/**
- * The type of permissions that can be requested from the user.
- */
-[assert_size(4)]
-enum PP_TalkPermission {
-  /**
-   * Request permission for screencast.
-   */
-  PP_TALKPERMISSION_SCREENCAST,
-  /**
-   * Request permission for Remote Desktop.
-   */
-  PP_TALKPERMISSION_REMOTING,
-  /**
-   * Request permission for continuing Remote Desktop.
-   */
-  PP_TALKPERMISSION_REMOTING_CONTINUE,
-  /**
-   * Number of permissions.
-   */
-  PP_TALKPERMISSION_NUM_PERMISSIONS
-};
-
-/**
- * Talk event types reported by the browser.
- */
-[assert_size(4)]
-enum PP_TalkEvent {
-  /**
-   * Indicates that the user took action to terminate the remoting session.
-   */
-  PP_TALKEVENT_TERMINATE,
-  /**
-   * Indicates that an error occurred (e.g. failed to show the UI).
-   */
-  PP_TALKEVENT_ERROR,
-  /**
-   * Number of events
-   */
-  PP_TALKEVENT_NUM_EVENTS
-};
-
-/**
- * Callback for Talk events.
- */
-typedef void PP_TalkEventCallback([inout] mem_t user_data,
-                                  [in] PP_TalkEvent event);
-
-/**
- * Extra interface for Talk.
- */
-interface PPB_Talk_Private {
-  /**
-   * Creates a Talk_Private resource.
-   */
-  [version=1.0]
-  PP_Resource Create(PP_Instance instance);
-
-  /**
-   * Displays confirmation dialog for screencasting.
-   *
-   * The callback will be issued with 1 as the result if the user gave
-   * permission, or 0 if the user denied.
-   *
-   * You can only have one call pending. It will return PP_OK_COMPLETIONPENDING
-   * if the request is queued, or PP_ERROR_INPROGRESS if there is already a
-   * request in progress.
-   *
-   * (Deprecated in 2.0. Please us RequestPermission instead.)
-   */
-  [version=1.0, deprecate=2.0]
-  int32_t GetPermission(
-      [in] PP_Resource talk_resource,
-      [in] PP_CompletionCallback callback);
-
-  /**
-   * Requests permission from the user using a system modal dialog.
-   *
-   * <code>permission</code> specifies the type of permission to request from
-   * the user.
-   *
-   * <code>callback</code> is the completion callback. It will be issued with 1
-   * as the result if the user gave permission, or 0 if the user denied.
-   *
-   * You can only have one call pending. It will return PP_OK_COMPLETIONPENDING
-   * if the request is queued, or PP_ERROR_INPROGRESS if there is already a
-   * request in progress.
-   */
-  [version=2.0]
-  int32_t RequestPermission(
-      [in] PP_Resource talk_resource,
-      [in] PP_TalkPermission permission,
-      [in] PP_CompletionCallback callback);
-
-  /**
-   * Shows the remoting-in-progress UI and registers a callback for events.
-   *
-   * <code>event_callback</code> is the callback for session releated events.
-   * It will only start receiving events after the completion callback has been
-   * issued. This callback will be called on the pepper main thread.
-   *
-   * <code>user_data</code> is an opaque value used when
-   * <code>event_callback</code> is invoked.
-   *
-   * <code>callback</code> is the completion callback.
-   *
-   * You can only have one call pending. It will return PP_OK_COMPLETIONPENDING
-   * if the request is queued, or PP_ERROR_INPROGRESS if there is already a
-   * request in progress. PP_ERROR_INPROGRESS will also be returned if a
-   * previous call to StartRemoting succeeded without a corresponding
-   * StopRemoting call.
-   */
-  [version=2.0]
-  int32_t StartRemoting(
-      [in] PP_Resource talk_resource,
-      [in] PP_TalkEventCallback event_callback,
-      [inout] mem_t user_data,
-      [in] PP_CompletionCallback callback);
-
-  /**
-   * Hides the remoting-in-progress UI and unregisters the event callback.
-   *
-   * <code>callback</code> is the completion callback.
-   */
-  [version=2.0]
-  int32_t StopRemoting(
-      [in] PP_Resource talk_resource,
-      [in] PP_CompletionCallback callback);
-};
diff --git a/ppapi/c/private/ppb_talk_private.h b/ppapi/c/private/ppb_talk_private.h
deleted file mode 100644
index 7fc11cc..0000000
--- a/ppapi/c/private/ppb_talk_private.h
+++ /dev/null
@@ -1,159 +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.
- */
-
-/* From private/ppb_talk_private.idl modified Thu Jun  6 10:54:19 2013. */
-
-#ifndef PPAPI_C_PRIVATE_PPB_TALK_PRIVATE_H_
-#define PPAPI_C_PRIVATE_PPB_TALK_PRIVATE_H_
-
-#include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_macros.h"
-#include "ppapi/c/pp_resource.h"
-#include "ppapi/c/pp_stdint.h"
-
-#define PPB_TALK_PRIVATE_INTERFACE_1_0 "PPB_Talk_Private;1.0"
-#define PPB_TALK_PRIVATE_INTERFACE_2_0 "PPB_Talk_Private;2.0"
-#define PPB_TALK_PRIVATE_INTERFACE PPB_TALK_PRIVATE_INTERFACE_2_0
-
-/**
- * @file
- * This file contains the <code>PPB_Talk_Private</code> interface.
- */
-
-
-/**
- * @addtogroup Enums
- * @{
- */
-/**
- * The type of permissions that can be requested from the user.
- */
-typedef enum {
-  /**
-   * Request permission for screencast.
-   */
-  PP_TALKPERMISSION_SCREENCAST,
-  /**
-   * Request permission for Remote Desktop.
-   */
-  PP_TALKPERMISSION_REMOTING,
-  /**
-   * Request permission for continuing Remote Desktop.
-   */
-  PP_TALKPERMISSION_REMOTING_CONTINUE,
-  /**
-   * Number of permissions.
-   */
-  PP_TALKPERMISSION_NUM_PERMISSIONS
-} PP_TalkPermission;
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_TalkPermission, 4);
-
-/**
- * Talk event types reported by the browser.
- */
-typedef enum {
-  /**
-   * Indicates that the user took action to terminate the remoting session.
-   */
-  PP_TALKEVENT_TERMINATE,
-  /**
-   * Indicates that an error occurred (e.g. failed to show the UI).
-   */
-  PP_TALKEVENT_ERROR,
-  /**
-   * Number of events
-   */
-  PP_TALKEVENT_NUM_EVENTS
-} PP_TalkEvent;
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_TalkEvent, 4);
-/**
- * @}
- */
-
-/**
- * @addtogroup Typedefs
- * @{
- */
-/**
- * Callback for Talk events.
- */
-typedef void (*PP_TalkEventCallback)(void* user_data, PP_TalkEvent event);
-/**
- * @}
- */
-
-/**
- * @addtogroup Interfaces
- * @{
- */
-/**
- * Extra interface for Talk.
- */
-struct PPB_Talk_Private_2_0 {
-  /**
-   * Creates a Talk_Private resource.
-   */
-  PP_Resource (*Create)(PP_Instance instance);
-  /**
-   * Requests permission from the user using a system modal dialog.
-   *
-   * <code>permission</code> specifies the type of permission to request from
-   * the user.
-   *
-   * <code>callback</code> is the completion callback. It will be issued with 1
-   * as the result if the user gave permission, or 0 if the user denied.
-   *
-   * You can only have one call pending. It will return PP_OK_COMPLETIONPENDING
-   * if the request is queued, or PP_ERROR_INPROGRESS if there is already a
-   * request in progress.
-   */
-  int32_t (*RequestPermission)(PP_Resource talk_resource,
-                               PP_TalkPermission permission,
-                               struct PP_CompletionCallback callback);
-  /**
-   * Shows the remoting-in-progress UI and registers a callback for events.
-   *
-   * <code>event_callback</code> is the callback for session releated events.
-   * It will only start receiving events after the completion callback has been
-   * issued. This callback will be called on the pepper main thread.
-   *
-   * <code>user_data</code> is an opaque value used when
-   * <code>event_callback</code> is invoked.
-   *
-   * <code>callback</code> is the completion callback.
-   *
-   * You can only have one call pending. It will return PP_OK_COMPLETIONPENDING
-   * if the request is queued, or PP_ERROR_INPROGRESS if there is already a
-   * request in progress. PP_ERROR_INPROGRESS will also be returned if a
-   * previous call to StartRemoting succeeded without a corresponding
-   * StopRemoting call.
-   */
-  int32_t (*StartRemoting)(PP_Resource talk_resource,
-                           PP_TalkEventCallback event_callback,
-                           void* user_data,
-                           struct PP_CompletionCallback callback);
-  /**
-   * Hides the remoting-in-progress UI and unregisters the event callback.
-   *
-   * <code>callback</code> is the completion callback.
-   */
-  int32_t (*StopRemoting)(PP_Resource talk_resource,
-                          struct PP_CompletionCallback callback);
-};
-
-typedef struct PPB_Talk_Private_2_0 PPB_Talk_Private;
-
-struct PPB_Talk_Private_1_0 {
-  PP_Resource (*Create)(PP_Instance instance);
-  int32_t (*GetPermission)(PP_Resource talk_resource,
-                           struct PP_CompletionCallback callback);
-};
-/**
- * @}
- */
-
-#endif  /* PPAPI_C_PRIVATE_PPB_TALK_PRIVATE_H_ */
-
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
index 26b2bdd..228c75c 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
@@ -69,7 +69,6 @@
 #include "ppapi/c/private/ppb_net_address_private.h"
 #include "ppapi/c/private/ppb_output_protection_private.h"
 #include "ppapi/c/private/ppb_platform_verification_private.h"
-#include "ppapi/c/private/ppb_talk_private.h"
 #include "ppapi/c/private/ppb_tcp_server_socket_private.h"
 #include "ppapi/c/private/ppb_tcp_socket_private.h"
 #include "ppapi/c/private/ppb_testing_private.h"
@@ -190,8 +189,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetAddress_Private_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetAddress_Private_1_1;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_OutputProtection_Private_0_1;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_PlatformVerification_Private_0_2;
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Talk_Private_1_0;
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Talk_Private_2_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TCPServerSocket_Private_0_1;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TCPServerSocket_Private_0_2;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TCPSocket_Private_0_3;
@@ -3859,44 +3856,6 @@ static int32_t Pnacl_M32_PPB_PlatformVerification_Private_ChallengePlatform(PP_R
 
 /* End wrapper methods for PPB_PlatformVerification_Private_0_2 */
 
-/* Begin wrapper methods for PPB_Talk_Private_1_0 */
-
-static PP_Resource Pnacl_M19_PPB_Talk_Private_Create(PP_Instance instance) {
-  const struct PPB_Talk_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_Talk_Private_1_0.real_iface;
-  return iface->Create(instance);
-}
-
-static int32_t Pnacl_M19_PPB_Talk_Private_GetPermission(PP_Resource talk_resource, struct PP_CompletionCallback* callback) {
-  const struct PPB_Talk_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_Talk_Private_1_0.real_iface;
-  return iface->GetPermission(talk_resource, *callback);
-}
-
-/* End wrapper methods for PPB_Talk_Private_1_0 */
-
-/* Begin wrapper methods for PPB_Talk_Private_2_0 */
-
-static PP_Resource Pnacl_M29_PPB_Talk_Private_Create(PP_Instance instance) {
-  const struct PPB_Talk_Private_2_0 *iface = Pnacl_WrapperInfo_PPB_Talk_Private_2_0.real_iface;
-  return iface->Create(instance);
-}
-
-static int32_t Pnacl_M29_PPB_Talk_Private_RequestPermission(PP_Resource talk_resource, PP_TalkPermission permission, struct PP_CompletionCallback* callback) {
-  const struct PPB_Talk_Private_2_0 *iface = Pnacl_WrapperInfo_PPB_Talk_Private_2_0.real_iface;
-  return iface->RequestPermission(talk_resource, permission, *callback);
-}
-
-static int32_t Pnacl_M29_PPB_Talk_Private_StartRemoting(PP_Resource talk_resource, PP_TalkEventCallback event_callback, void* user_data, struct PP_CompletionCallback* callback) {
-  const struct PPB_Talk_Private_2_0 *iface = Pnacl_WrapperInfo_PPB_Talk_Private_2_0.real_iface;
-  return iface->StartRemoting(talk_resource, event_callback, user_data, *callback);
-}
-
-static int32_t Pnacl_M29_PPB_Talk_Private_StopRemoting(PP_Resource talk_resource, struct PP_CompletionCallback* callback) {
-  const struct PPB_Talk_Private_2_0 *iface = Pnacl_WrapperInfo_PPB_Talk_Private_2_0.real_iface;
-  return iface->StopRemoting(talk_resource, *callback);
-}
-
-/* End wrapper methods for PPB_Talk_Private_2_0 */
-
 /* Begin wrapper methods for PPB_TCPServerSocket_Private_0_1 */
 
 static PP_Resource Pnacl_M18_PPB_TCPServerSocket_Private_Create(PP_Instance instance) {
@@ -5602,18 +5561,6 @@ static const struct PPB_PlatformVerification_Private_0_2 Pnacl_Wrappers_PPB_Plat
     .ChallengePlatform = (int32_t (*)(PP_Resource instance, struct PP_Var service_id, struct PP_Var challenge, struct PP_Var* signed_data, struct PP_Var* signed_data_signature, struct PP_Var* platform_key_certificate, struct PP_CompletionCallback callback))&Pnacl_M32_PPB_PlatformVerification_Private_ChallengePlatform
 };
 
-static const struct PPB_Talk_Private_1_0 Pnacl_Wrappers_PPB_Talk_Private_1_0 = {
-    .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M19_PPB_Talk_Private_Create,
-    .GetPermission = (int32_t (*)(PP_Resource talk_resource, struct PP_CompletionCallback callback))&Pnacl_M19_PPB_Talk_Private_GetPermission
-};
-
-static const struct PPB_Talk_Private_2_0 Pnacl_Wrappers_PPB_Talk_Private_2_0 = {
-    .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M29_PPB_Talk_Private_Create,
-    .RequestPermission = (int32_t (*)(PP_Resource talk_resource, PP_TalkPermission permission, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_Talk_Private_RequestPermission,
-    .StartRemoting = (int32_t (*)(PP_Resource talk_resource, PP_TalkEventCallback event_callback, void* user_data, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_Talk_Private_StartRemoting,
-    .StopRemoting = (int32_t (*)(PP_Resource talk_resource, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_Talk_Private_StopRemoting
-};
-
 static const struct PPB_TCPServerSocket_Private_0_1 Pnacl_Wrappers_PPB_TCPServerSocket_Private_0_1 = {
     .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M18_PPB_TCPServerSocket_Private_Create,
     .IsTCPServerSocket = (PP_Bool (*)(PP_Resource resource))&Pnacl_M18_PPB_TCPServerSocket_Private_IsTCPServerSocket,
@@ -6351,18 +6298,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_PlatformVerification_Priv
   .real_iface = NULL
 };
 
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Talk_Private_1_0 = {
-  .iface_macro = PPB_TALK_PRIVATE_INTERFACE_1_0,
-  .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_Talk_Private_1_0,
-  .real_iface = NULL
-};
-
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Talk_Private_2_0 = {
-  .iface_macro = PPB_TALK_PRIVATE_INTERFACE_2_0,
-  .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_Talk_Private_2_0,
-  .real_iface = NULL
-};
-
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TCPServerSocket_Private_0_1 = {
   .iface_macro = PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_1,
   .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_TCPServerSocket_Private_0_1,
@@ -6547,8 +6482,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
   &Pnacl_WrapperInfo_PPB_NetAddress_Private_1_1,
   &Pnacl_WrapperInfo_PPB_OutputProtection_Private_0_1,
   &Pnacl_WrapperInfo_PPB_PlatformVerification_Private_0_2,
-  &Pnacl_WrapperInfo_PPB_Talk_Private_1_0,
-  &Pnacl_WrapperInfo_PPB_Talk_Private_2_0,
   &Pnacl_WrapperInfo_PPB_TCPServerSocket_Private_0_1,
   &Pnacl_WrapperInfo_PPB_TCPServerSocket_Private_0_2,
   &Pnacl_WrapperInfo_PPB_TCPSocket_Private_0_3,
diff --git a/ppapi/ppapi_proxy.gypi b/ppapi/ppapi_proxy.gypi
index 6ac6454..d099e0a 100644
--- a/ppapi/ppapi_proxy.gypi
+++ b/ppapi/ppapi_proxy.gypi
@@ -200,8 +200,6 @@
           'proxy/resource_message_filter.h',
           'proxy/resource_reply_thread_registrar.cc',
           'proxy/resource_reply_thread_registrar.h',
-          'proxy/talk_resource.cc',
-          'proxy/talk_resource.h',
           'proxy/tcp_server_socket_private_resource.cc',
           'proxy/tcp_server_socket_private_resource.h',
           'proxy/tcp_socket_private_resource.cc',
@@ -289,7 +287,6 @@
               'proxy/ppb_flash_message_loop_proxy.cc',
               'proxy/ppb_flash_proxy.cc',
               'proxy/ppb_pdf_proxy.cc',
-              'proxy/ppb_talk_private_proxy.cc',
               'proxy/ppb_var_deprecated_proxy.cc',
               'proxy/ppb_video_capture_proxy.cc',
               'proxy/ppb_video_decoder_proxy.cc',
@@ -297,7 +294,6 @@
               'proxy/ppp_instance_private_proxy.cc',
               'proxy/ppp_video_decoder_proxy.cc',
               'proxy/serialized_flash_menu.cc',
-              'proxy/talk_resource.cc',
               'proxy/video_capture_resource.cc',
             ],
           }],
diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi
index b2605fe..a516dab 100644
--- a/ppapi/ppapi_shared.gypi
+++ b/ppapi/ppapi_shared.gypi
@@ -248,8 +248,6 @@
           'thunk/ppb_printing_dev_thunk.cc',
           'thunk/ppb_scrollbar_api.h',
           'thunk/ppb_scrollbar_thunk.cc',
-          'thunk/ppb_talk_private_api.h',
-          'thunk/ppb_talk_private_thunk.cc',
           'thunk/ppb_tcp_server_socket_private_api.h',
           'thunk/ppb_tcp_server_socket_private_thunk.cc',
           'thunk/ppb_tcp_socket_api.h',
@@ -339,7 +337,6 @@
               'thunk/ppb_pdf_thunk.cc',
               'thunk/ppb_platform_verification_private_thunk.cc',
               'thunk/ppb_scrollbar_thunk.cc',
-              'thunk/ppb_talk_private_thunk.cc',
               'thunk/ppb_transport_thunk.cc',
               'thunk/ppb_url_util_thunk.cc',
               'thunk/ppb_video_capture_thunk.cc',
diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi
index b733d7e..add92ce 100644
--- a/ppapi/ppapi_sources.gypi
+++ b/ppapi/ppapi_sources.gypi
@@ -570,8 +570,6 @@
       'tests/test_pdf.h',
       'tests/test_platform_verification_private.cc',
       'tests/test_platform_verification_private.h',
-      'tests/test_talk_private.cc',
-      'tests/test_talk_private.h',
       'tests/test_tcp_socket_private_trusted.cc',
       'tests/test_tcp_socket_private_trusted.h',
       'tests/test_url_util.cc',
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index 4fbd8f5..09d1c6c 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -177,7 +177,6 @@
         'proxy/printing_resource_unittest.cc',
         'proxy/raw_var_data_unittest.cc',
         'proxy/serialized_var_unittest.cc',
-        'proxy/talk_resource_unittest.cc',
         'proxy/tracked_callback_unittest.cc',
         'proxy/video_decoder_resource_unittest.cc',
         'proxy/video_encoder_resource_unittest.cc',
diff --git a/ppapi/proxy/BUILD.gn b/ppapi/proxy/BUILD.gn
index 31a0262..f3f07f3 100644
--- a/ppapi/proxy/BUILD.gn
+++ b/ppapi/proxy/BUILD.gn
@@ -256,8 +256,6 @@ component("proxy") {
       "ppp_instance_private_proxy.h",
       "ppp_video_decoder_proxy.cc",
       "ppp_video_decoder_proxy.h",
-      "talk_resource.cc",
-      "talk_resource.h",
       "video_capture_resource.cc",
       "video_capture_resource.h",
     ]
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index 767751c..52b6a3d 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -95,7 +95,6 @@
 #include "ppapi/c/private/ppb_output_protection_private.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/c/private/ppb_platform_verification_private.h"
-#include "ppapi/c/private/ppb_talk_private.h"
 #include "ppapi/c/private/ppb_tcp_server_socket_private.h"
 #include "ppapi/c/private/ppb_tcp_socket_private.h"
 #include "ppapi/c/private/ppb_testing_private.h"
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 54a0d74..cd94bfd 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -50,7 +50,6 @@
 #include "ppapi/c/private/ppb_isolated_file_system_private.h"
 #include "ppapi/c/private/ppb_net_address_private.h"
 #include "ppapi/c/private/ppb_pdf.h"
-#include "ppapi/c/private/ppb_talk_private.h"
 #include "ppapi/c/private/ppp_flash_browser_operations.h"
 #include "ppapi/c/private/ppp_pdf.h"
 #include "ppapi/proxy/host_resolver_private_resource.h"
@@ -119,9 +118,6 @@ IPC_ENUM_TRAITS(PP_PrivateFontCharset)
 IPC_ENUM_TRAITS(PP_ResourceImage)
 IPC_ENUM_TRAITS(PP_ResourceString)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_SessionType, PP_SESSIONTYPE_PERSISTENT_RELEASE)
-IPC_ENUM_TRAITS_MAX_VALUE(PP_TalkEvent, PP_TALKEVENT_NUM_EVENTS - 1)
-IPC_ENUM_TRAITS_MAX_VALUE(PP_TalkPermission,
-                          PP_TALKPERMISSION_NUM_PERMISSIONS - 1)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_TCPSocket_Option,
                           PP_TCPSOCKET_OPTION_RECV_BUFFER_SIZE)
 IPC_ENUM_TRAITS(PP_TextInput_Type)
@@ -2354,16 +2350,4 @@ IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError,
 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady,
                      uint32_t /* buffer */)
 
-// Talk ------------------------------------------------------------------------
-
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_Create)
-IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission,
-                     PP_TalkPermission /* permission */)
-IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply)
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting)
-IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply)
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting)
-IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply)
-IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */)
-
 #endif  // !defined(OS_NACL) && !defined(NACL_WIN64)
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index bcb044e..e20eb9d 100644
--- a/ppapi/proxy/resource_creation_proxy.cc
+++ b/ppapi/proxy/resource_creation_proxy.cc
@@ -38,7 +38,6 @@
 #include "ppapi/proxy/ppb_video_decoder_proxy.h"
 #include "ppapi/proxy/ppb_x509_certificate_private_proxy.h"
 #include "ppapi/proxy/printing_resource.h"
-#include "ppapi/proxy/talk_resource.h"
 #include "ppapi/proxy/tcp_server_socket_private_resource.h"
 #include "ppapi/proxy/tcp_socket_private_resource.h"
 #include "ppapi/proxy/tcp_socket_resource.h"
@@ -476,10 +475,6 @@ PP_Resource ResourceCreationProxy::CreateScrollbar(PP_Instance instance,
   return 0;
 }
 
-PP_Resource ResourceCreationProxy::CreateTalk(PP_Instance instance) {
-  return (new TalkResource(GetConnection(), instance))->GetReference();
-}
-
 PP_Resource ResourceCreationProxy::CreateVideoCapture(PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
diff --git a/ppapi/proxy/resource_creation_proxy.h b/ppapi/proxy/resource_creation_proxy.h
index 957463d..bdbc83a 100644
--- a/ppapi/proxy/resource_creation_proxy.h
+++ b/ppapi/proxy/resource_creation_proxy.h
@@ -182,7 +182,6 @@ class ResourceCreationProxy : public InterfaceProxy,
       PP_Instance instance) override;
   virtual PP_Resource CreateScrollbar(PP_Instance instance,
                                       PP_Bool vertical) override;
-  virtual PP_Resource CreateTalk(PP_Instance instance) override;
   virtual PP_Resource CreateVideoCapture(PP_Instance instance) override;
   virtual PP_Resource CreateVideoDecoderDev(
       PP_Instance instance,
diff --git a/ppapi/proxy/talk_resource.cc b/ppapi/proxy/talk_resource.cc
deleted file mode 100644
index b076064..0000000
--- a/ppapi/proxy/talk_resource.cc
+++ /dev/null
@@ -1,114 +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/proxy/talk_resource.h"
-
-#include "base/bind.h"
-#include "ppapi/proxy/ppapi_messages.h"
-
-namespace ppapi {
-namespace proxy {
-
-TalkResource::TalkResource(Connection connection, PP_Instance instance)
-    : PluginResource(connection, instance),
-      event_callback_(NULL),
-      event_callback_user_data_(NULL) {
-  SendCreate(BROWSER, PpapiHostMsg_Talk_Create());
-}
-
-TalkResource::~TalkResource() {
-}
-
-thunk::PPB_Talk_Private_API* TalkResource::AsPPB_Talk_Private_API() {
-  return this;
-}
-
-int32_t TalkResource::RequestPermission(
-    PP_TalkPermission permission,
-    scoped_refptr<TrackedCallback> callback) {
-  if (TrackedCallback::IsPending(permission_callback_))
-    return PP_ERROR_INPROGRESS;
-
-  permission_callback_ = callback;
-
-  Call<PpapiPluginMsg_Talk_RequestPermissionReply>(
-      BROWSER,
-      PpapiHostMsg_Talk_RequestPermission(permission),
-      base::Bind(&TalkResource::OnRequestPermissionReply,
-                 base::Unretained(this)));
-  return PP_OK_COMPLETIONPENDING;
-}
-
-int32_t TalkResource::StartRemoting(PP_TalkEventCallback event_callback,
-                                    void* user_data,
-                                    scoped_refptr<TrackedCallback> callback) {
-  if (TrackedCallback::IsPending(start_callback_) ||
-      event_callback_ != NULL)
-    return PP_ERROR_INPROGRESS;
-
-  start_callback_ = callback;
-  event_callback_ = event_callback;
-  event_callback_user_data_ = user_data;
-
-  Call<PpapiPluginMsg_Talk_StartRemotingReply>(
-      BROWSER,
-      PpapiHostMsg_Talk_StartRemoting(),
-      base::Bind(&TalkResource::OnStartRemotingReply,
-                 base::Unretained(this)));
-  return PP_OK_COMPLETIONPENDING;
-}
-
-int32_t TalkResource::StopRemoting(scoped_refptr<TrackedCallback> callback) {
-  if (TrackedCallback::IsPending(stop_callback_))
-    return PP_ERROR_INPROGRESS;
-
-  if (event_callback_ == NULL)
-    return PP_ERROR_FAILED;
-
-  stop_callback_ = callback;
-
-  Call<PpapiPluginMsg_Talk_StopRemotingReply>(
-      BROWSER,
-      PpapiHostMsg_Talk_StopRemoting(),
-      base::Bind(&TalkResource::OnStopRemotingReply,
-                 base::Unretained(this)));
-  return PP_OK_COMPLETIONPENDING;
-}
-
-void TalkResource::OnReplyReceived(const ResourceMessageReplyParams& params,
-                                   const IPC::Message& msg) {
-  PPAPI_BEGIN_MESSAGE_MAP(TalkResource, msg)
-    PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL(
-        PpapiPluginMsg_Talk_NotifyEvent,
-        OnNotifyEvent)
-    PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL_UNHANDLED(
-        PluginResource::OnReplyReceived(params, msg))
-  PPAPI_END_MESSAGE_MAP()
-}
-
-void TalkResource::OnNotifyEvent(const ResourceMessageReplyParams& params,
-                                 PP_TalkEvent event) {
-  if (event_callback_ != NULL)
-    event_callback_(event_callback_user_data_, event);
-}
-
-void TalkResource::OnRequestPermissionReply(
-    const ResourceMessageReplyParams& params) {
-  permission_callback_->Run(params.result());
-}
-
-void TalkResource::OnStartRemotingReply(
-    const ResourceMessageReplyParams& params) {
-  start_callback_->Run(params.result());
-}
-
-void TalkResource::OnStopRemotingReply(
-    const ResourceMessageReplyParams& params) {
-  event_callback_ = NULL;
-  event_callback_user_data_ = NULL;
-  stop_callback_->Run(params.result());
-}
-
-}  // namespace proxy
-}  // namespace ppapi
diff --git a/ppapi/proxy/talk_resource.h b/ppapi/proxy/talk_resource.h
deleted file mode 100644
index 968b5fd..0000000
--- a/ppapi/proxy/talk_resource.h
+++ /dev/null
@@ -1,57 +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.
-
-#ifndef PPAPI_PROXY_TALK_RESOURCE_H_
-#define PPAPI_PROXY_TALK_RESOURCE_H_
-
-#include "ppapi/proxy/plugin_resource.h"
-#include "ppapi/proxy/ppapi_proxy_export.h"
-#include "ppapi/shared_impl/tracked_callback.h"
-#include "ppapi/thunk/ppb_talk_private_api.h"
-
-namespace ppapi {
-namespace proxy {
-
-class PPAPI_PROXY_EXPORT TalkResource
-    : public PluginResource,
-      public NON_EXPORTED_BASE(thunk::PPB_Talk_Private_API) {
- public:
-  TalkResource(Connection connection, PP_Instance instance);
-  ~TalkResource() override;
-
-  // Resource overrides.
-  thunk::PPB_Talk_Private_API* AsPPB_Talk_Private_API() override;
-
- private:
-  // PPB_Talk_API implementation.
-  int32_t RequestPermission(PP_TalkPermission permission,
-                            scoped_refptr<TrackedCallback> callback) override;
-  int32_t StartRemoting(PP_TalkEventCallback event_callback,
-                        void* user_data,
-                        scoped_refptr<TrackedCallback> callback) override;
-  int32_t StopRemoting(scoped_refptr<TrackedCallback> callback) override;
-
-  // PluginResource override.
-  void OnReplyReceived(const ResourceMessageReplyParams& params,
-                       const IPC::Message& msg) override;
-
-  void OnNotifyEvent(const ResourceMessageReplyParams& params,
-                     PP_TalkEvent event);
-  void OnRequestPermissionReply(const ResourceMessageReplyParams& params);
-  void OnStartRemotingReply(const ResourceMessageReplyParams& params);
-  void OnStopRemotingReply(const ResourceMessageReplyParams& params);
-
-  scoped_refptr<TrackedCallback> permission_callback_;
-  scoped_refptr<TrackedCallback> start_callback_;
-  scoped_refptr<TrackedCallback> stop_callback_;
-  PP_TalkEventCallback event_callback_;
-  void* event_callback_user_data_;
-
-  DISALLOW_COPY_AND_ASSIGN(TalkResource);
-};
-
-}  // namespace proxy
-}  // namespace ppapi
-
-#endif  // PPAPI_PROXY_TALK_RESOURCE_H_
diff --git a/ppapi/proxy/talk_resource_unittest.cc b/ppapi/proxy/talk_resource_unittest.cc
deleted file mode 100644
index 3b7d5ff..0000000
--- a/ppapi/proxy/talk_resource_unittest.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2013 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/proxy/locking_resource_releaser.h"
-#include "ppapi/proxy/plugin_message_filter.h"
-#include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/proxy/ppapi_proxy_test.h"
-#include "ppapi/proxy/talk_resource.h"
-#include "ppapi/thunk/thunk.h"
-
-namespace ppapi {
-namespace proxy {
-
-namespace {
-
-template <class ResultType>
-class MockCallbackBase {
- public:
-  MockCallbackBase() : called_(false) {
-  }
-
-  bool called() {
-    return called_;
-  }
-
-  ResultType result() {
-    return result_;
-  }
-
-  void Reset() {
-    called_ = false;
-  }
-
-  static void Callback(void* user_data, ResultType result) {
-    MockCallbackBase* that = reinterpret_cast<MockCallbackBase*>(user_data);
-    that->called_ = true;
-    that->result_ = result;
-  }
-
- private:
-  bool called_;
-  ResultType result_;
-};
-
-typedef MockCallbackBase<int32_t> MockCompletionCallback;
-typedef MockCallbackBase<PP_TalkEvent> TalkEventCallback;
-
-class TalkResourceTest : public PluginProxyTest {
- public:
-  void SendReply(
-      uint32_t id,
-      const IPC::Message& reply,
-      int32_t result) {
-    IPC::Message msg;
-    ResourceMessageCallParams params;
-    ASSERT_TRUE(sink().GetFirstResourceCallMatching(id, &params, &msg));
-
-    ResourceMessageReplyParams reply_params(params.pp_resource(),
-                                            params.sequence());
-    reply_params.set_result(result);
-    PluginMessageFilter::DispatchResourceReplyForTest(reply_params, reply);
-  }
-};
-
-
-}  // namespace
-
-TEST_F(TalkResourceTest, GetPermission) {
-  const PPB_Talk_Private_1_0* talk = thunk::GetPPB_Talk_Private_1_0_Thunk();
-  LockingResourceReleaser res(talk->Create(pp_instance()));
-  MockCompletionCallback callback;
-
-  int32_t result = talk->GetPermission(
-      res.get(),
-      PP_MakeCompletionCallback(&MockCompletionCallback::Callback, &callback));
-  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
-
-  ResourceMessageCallParams params;
-  IPC::Message msg;
-  ASSERT_TRUE(sink().GetFirstResourceCallMatching(
-      PpapiHostMsg_Talk_RequestPermission::ID, &params, &msg));
-
-  ResourceMessageReplyParams reply_params(params.pp_resource(),
-                                          params.sequence());
-  reply_params.set_result(1);
-  PluginMessageFilter::DispatchResourceReplyForTest(
-      reply_params, PpapiPluginMsg_Talk_RequestPermissionReply());
-
-  ASSERT_TRUE(callback.called());
-  ASSERT_EQ(1, callback.result());
-}
-
-TEST_F(TalkResourceTest, RequestPermission) {
-  const PPB_Talk_Private_2_0* talk = thunk::GetPPB_Talk_Private_2_0_Thunk();
-  LockingResourceReleaser res(talk->Create(pp_instance()));
-  MockCompletionCallback callback;
-
-  int32_t result = talk->RequestPermission(
-      res.get(),
-      PP_TALKPERMISSION_REMOTING_CONTINUE,
-      PP_MakeCompletionCallback(&MockCompletionCallback::Callback, &callback));
-  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
-
-  ResourceMessageCallParams params;
-  IPC::Message msg;
-  ASSERT_TRUE(sink().GetFirstResourceCallMatching(
-      PpapiHostMsg_Talk_RequestPermission::ID, &params, &msg));
-
-  ResourceMessageReplyParams reply_params(params.pp_resource(),
-                                          params.sequence());
-  reply_params.set_result(1);
-  PluginMessageFilter::DispatchResourceReplyForTest(
-      reply_params, PpapiPluginMsg_Talk_RequestPermissionReply());
-
-  ASSERT_TRUE(callback.called());
-  ASSERT_EQ(1, callback.result());
-}
-
-TEST_F(TalkResourceTest, StartStopRemoting) {
-  const PPB_Talk_Private_2_0* talk = thunk::GetPPB_Talk_Private_2_0_Thunk();
-  LockingResourceReleaser res(talk->Create(pp_instance()));
-  MockCompletionCallback callback;
-  TalkEventCallback event_callback;
-
-  // Start
-  int32_t result = talk->StartRemoting(
-      res.get(),
-      &TalkEventCallback::Callback,
-      &event_callback,
-      PP_MakeCompletionCallback(&MockCompletionCallback::Callback, &callback));
-  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
-
-  SendReply(PpapiHostMsg_Talk_StartRemoting::ID,
-            PpapiPluginMsg_Talk_StartRemotingReply(),
-            PP_OK);
-
-  ASSERT_TRUE(callback.called());
-  ASSERT_EQ(PP_OK, callback.result());
-
-  // Receive an event
-  ASSERT_FALSE(event_callback.called());
-  ResourceMessageReplyParams notify_params(res.get(), 0);
-  PluginMessageFilter::DispatchResourceReplyForTest(
-      notify_params, PpapiPluginMsg_Talk_NotifyEvent(PP_TALKEVENT_ERROR));
-  ASSERT_TRUE(event_callback.called());
-  ASSERT_EQ(PP_TALKEVENT_ERROR, event_callback.result());
-
-  // Stop
-  callback.Reset();
-  result = talk->StopRemoting(
-      res.get(),
-      PP_MakeCompletionCallback(&MockCompletionCallback::Callback, &callback));
-  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
-
-  SendReply(PpapiHostMsg_Talk_StopRemoting::ID,
-           PpapiPluginMsg_Talk_StopRemotingReply(),
-           PP_OK);
-
-  ASSERT_TRUE(callback.called());
-  ASSERT_EQ(PP_OK, callback.result());
-
-  // Events should be discarded at this point
-  event_callback.Reset();
-  PluginMessageFilter::DispatchResourceReplyForTest(
-      notify_params, PpapiPluginMsg_Talk_NotifyEvent(PP_TALKEVENT_ERROR));
-  ASSERT_FALSE(event_callback.called());
-}
-
-}  // namespace proxy
-}  // namespace ppapi
diff --git a/ppapi/shared_impl/resource.h b/ppapi/shared_impl/resource.h
index 999ece3..21c62de 100644
--- a/ppapi/shared_impl/resource.h
+++ b/ppapi/shared_impl/resource.h
@@ -68,7 +68,6 @@
   F(PPB_PlatformVerification_API)       \
   F(PPB_Printing_API)                   \
   F(PPB_Scrollbar_API)                  \
-  F(PPB_Talk_Private_API)               \
   F(PPB_TrueTypeFont_API)               \
   F(PPB_TrueTypeFont_Singleton_API)     \
   F(PPB_TCPServerSocket_Private_API)    \
diff --git a/ppapi/tests/test_talk_private.cc b/ppapi/tests/test_talk_private.cc
deleted file mode 100644
index 80fee1f..0000000
--- a/ppapi/tests/test_talk_private.cc
+++ /dev/null
@@ -1,81 +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/tests/test_talk_private.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <string>
-
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/private/ppb_talk_private.h"
-#include "ppapi/cpp/instance.h"
-#include "ppapi/cpp/module.h"
-#include "ppapi/tests/test_utils.h"
-#include "ppapi/tests/testing_instance.h"
-
-REGISTER_TEST_CASE(TalkPrivate);
-
-TestTalkPrivate::TestTalkPrivate(TestingInstance* instance)
-    : TestCase(instance),
-      talk_private_interface_1(NULL) {
-}
-
-bool TestTalkPrivate::Init() {
-  if (!CheckTestingInterface()) {
-    instance_->AppendError("Testing interface not available");
-    return false;
-  }
-
-  talk_private_interface_1 = static_cast<const PPB_Talk_Private_1_0*>(
-      pp::Module::Get()->GetBrowserInterface(PPB_TALK_PRIVATE_INTERFACE_1_0));
-
-#if defined(__native_client__)
-  if (talk_private_interface_1)
-    instance_->AppendError("TalkPrivate interface is supported by NaCl");
-#else
-  if (!talk_private_interface_1)
-    instance_->AppendError("TalkPrivate interface not available");
-#endif
-  return true;
-}
-
-void TestTalkPrivate::RunTests(const std::string& filter) {
-  RUN_CALLBACK_TEST(TestTalkPrivate, GetPermission, filter);
-}
-
-std::string TestTalkPrivate::TestGetPermission() {
-  if (!talk_private_interface_1) {
-    PASS();
-  }
-
-  if (!testing_interface_->IsOutOfProcess()) {
-    // We only support out-of-process access to this API, so skip in-process
-    PASS();
-  }
-
-  // Under Ash, this will prompt the user so the test cannot run in an automated
-  // fashion. To manually test under Ash, replace "!defined(USE_ASH)" with 1.
-#if !defined(USE_ASH)
-  PP_Resource talk_resource = talk_private_interface_1->Create(
-      instance_->pp_instance());
-
-  TestCompletionCallback callback(instance_->pp_instance(), callback_type());
-  callback.WaitForResult(talk_private_interface_1->GetPermission(talk_resource,
-      callback.GetCallback().pp_completion_callback()));
-  CHECK_CALLBACK_BEHAVIOR(callback);
-
-#if defined(USE_ASH)
-  // Under Ash, this test will actually prompt the user and return either true
-  // or false depending on their choice.
-  if (callback.result() != 0 && callback.result() != 1)
-    return "Unexpected result";
-#else
-  // Currently not implemented without Ash, bur always returns false.
-  if (callback.result() != 0)
-    return "Unexpected non-zero result";
-#endif
-#endif
-  PASS();
-}
diff --git a/ppapi/tests/test_talk_private.h b/ppapi/tests/test_talk_private.h
deleted file mode 100644
index 4f641a3..0000000
--- a/ppapi/tests/test_talk_private.h
+++ /dev/null
@@ -1,27 +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.
-
-#ifndef PAPPI_TESTS_TEST_TALK_PRIVATE_H_
-#define PAPPI_TESTS_TEST_TALK_PRIVATE_H_
-
-#include <string>
-
-#include "ppapi/c/private/ppb_talk_private.h"
-#include "ppapi/tests/test_case.h"
-
-class TestTalkPrivate : public TestCase {
- public:
-  explicit TestTalkPrivate(TestingInstance* instance);
-
-  // TestCase implementation.
-  virtual bool Init();
-  virtual void RunTests(const std::string& filter);
-
- private:
-  std::string TestGetPermission();
-
-  const PPB_Talk_Private_1_0* talk_private_interface_1;
-};
-
-#endif  // PPAPI_TESTS_TEST_TALK_PRIVATE_H_
diff --git a/ppapi/thunk/BUILD.gn b/ppapi/thunk/BUILD.gn
index 18096a4..9247bf0 100644
--- a/ppapi/thunk/BUILD.gn
+++ b/ppapi/thunk/BUILD.gn
@@ -98,7 +98,6 @@ source_set("thunk") {
     "ppb_printing_api.h",
     "ppb_printing_dev_thunk.cc",
     "ppb_scrollbar_api.h",
-    "ppb_talk_private_api.h",
     "ppb_tcp_server_socket_private_api.h",
     "ppb_tcp_server_socket_private_thunk.cc",
     "ppb_tcp_socket_api.h",
@@ -171,7 +170,6 @@ source_set("thunk") {
       "ppb_pdf_thunk.cc",
       "ppb_platform_verification_private_thunk.cc",
       "ppb_scrollbar_thunk.cc",
-      "ppb_talk_private_thunk.cc",
       "ppb_url_util_thunk.cc",
       "ppb_video_capture_thunk.cc",
       "ppb_video_decoder_dev_thunk.cc",
diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h
index 9ac1b42..fffe667 100644
--- a/ppapi/thunk/interfaces_ppb_private.h
+++ b/ppapi/thunk/interfaces_ppb_private.h
@@ -45,10 +45,6 @@ PROXIED_IFACE(PPB_PDF_INTERFACE,
 PROXIED_IFACE(PPB_PLATFORMVERIFICATION_PRIVATE_INTERFACE_0_2,
               PPB_PlatformVerification_Private_0_2)
 #endif
-PROXIED_IFACE(PPB_TALK_PRIVATE_INTERFACE_1_0,
-              PPB_Talk_Private_1_0)
-PROXIED_IFACE(PPB_TALK_PRIVATE_INTERFACE_2_0,
-              PPB_Talk_Private_2_0)
 
 PROXIED_IFACE(PPB_URLLOADERTRUSTED_INTERFACE_0_3,
               PPB_URLLoaderTrusted_0_3)
diff --git a/ppapi/thunk/ppb_talk_private_api.h b/ppapi/thunk/ppb_talk_private_api.h
deleted file mode 100644
index a31cf9d..0000000
--- a/ppapi/thunk/ppb_talk_private_api.h
+++ /dev/null
@@ -1,36 +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.
-
-#ifndef PPAPI_THUNK_PPB_TALK_PRIVATE_API_H_
-#define PPAPI_THUNK_PPB_TALK_PRIVATE_API_H_
-
-#include "base/memory/ref_counted.h"
-#include "ppapi/c/private/ppb_talk_private.h"
-#include "ppapi/thunk/ppapi_thunk_export.h"
-
-namespace ppapi {
-
-class TrackedCallback;
-
-namespace thunk {
-
-class PPAPI_THUNK_EXPORT PPB_Talk_Private_API {
- public:
-  virtual ~PPB_Talk_Private_API() {}
-
-  virtual int32_t RequestPermission(
-      PP_TalkPermission permission,
-      scoped_refptr<TrackedCallback> callback) = 0;
-  virtual int32_t StartRemoting(
-      PP_TalkEventCallback event_callback,
-      void* user_data,
-      scoped_refptr<TrackedCallback> callback) = 0;
-  virtual int32_t StopRemoting(
-      scoped_refptr<TrackedCallback> callback) = 0;
-};
-
-}  // namespace thunk
-}  // namespace ppapi
-
-#endif  // PPAPI_THUNK_PPB_TALK_PRIVATE_API_H_
diff --git a/ppapi/thunk/ppb_talk_private_thunk.cc b/ppapi/thunk/ppb_talk_private_thunk.cc
deleted file mode 100644
index 6d2325d..0000000
--- a/ppapi/thunk/ppb_talk_private_thunk.cc
+++ /dev/null
@@ -1,87 +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/pp_errors.h"
-#include "ppapi/c/private/ppb_talk_private.h"
-#include "ppapi/shared_impl/tracked_callback.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_talk_private_api.h"
-#include "ppapi/thunk/thunk.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-PP_Resource Create(PP_Instance instance) {
-  EnterResourceCreation enter(instance);
-  if (enter.failed())
-    return 0;
-  return enter.functions()->CreateTalk(instance);
-}
-
-int32_t GetPermission(PP_Resource resource,
-                      PP_CompletionCallback callback) {
-  EnterResource<PPB_Talk_Private_API> enter(resource, callback, true);
-  if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
-  return enter.SetResult(enter.object()->RequestPermission(
-      PP_TALKPERMISSION_SCREENCAST, enter.callback()));
-}
-
-int32_t RequestPermission(PP_Resource resource,
-                          PP_TalkPermission permission,
-                          PP_CompletionCallback callback) {
-  EnterResource<PPB_Talk_Private_API> enter(resource, callback, true);
-  if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
-  return enter.SetResult(
-      enter.object()->RequestPermission(permission, enter.callback()));
-}
-
-int32_t StartRemoting(PP_Resource resource,
-                      PP_TalkEventCallback event_callback,
-                      void* user_data,
-                      PP_CompletionCallback callback) {
-  EnterResource<PPB_Talk_Private_API> enter(resource, callback, true);
-  if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
-  return enter.SetResult(
-      enter.object()->StartRemoting(event_callback, user_data,
-                                    enter.callback()));
-}
-
-int32_t StopRemoting(PP_Resource resource,
-                  PP_CompletionCallback callback) {
-  EnterResource<PPB_Talk_Private_API> enter(resource, callback, true);
-  if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
-  return enter.SetResult(
-      enter.object()->StopRemoting(enter.callback()));
-}
-
-const PPB_Talk_Private_1_0 g_ppb_talk_private_thunk_1_0 = {
-  &Create,
-  &GetPermission
-};
-
-const PPB_Talk_Private_2_0 g_ppb_talk_private_thunk_2_0 = {
-  &Create,
-  &RequestPermission,
-  &StartRemoting,
-  &StopRemoting
-};
-
-}  // namespace
-
-const PPB_Talk_Private_1_0* GetPPB_Talk_Private_1_0_Thunk() {
-  return &g_ppb_talk_private_thunk_1_0;
-}
-
-const PPB_Talk_Private_2_0* GetPPB_Talk_Private_2_0_Thunk() {
-  return &g_ppb_talk_private_thunk_2_0;
-}
-
-}  // namespace thunk
-}  // namespace ppapi
diff --git a/ppapi/thunk/resource_creation_api.h b/ppapi/thunk/resource_creation_api.h
index f8174c6..94311bb 100644
--- a/ppapi/thunk/resource_creation_api.h
+++ b/ppapi/thunk/resource_creation_api.h
@@ -195,7 +195,6 @@ class ResourceCreationAPI {
       PP_Instance instance) = 0;
   virtual PP_Resource CreateScrollbar(PP_Instance instance,
                                       PP_Bool vertical) = 0;
-  virtual PP_Resource CreateTalk(PP_Instance instance) = 0;
   virtual PP_Resource CreateVideoCapture(PP_Instance instance) = 0;
   virtual PP_Resource CreateVideoDecoderDev(
       PP_Instance instance,