BASELINE: Update Chromium to 88.0.4324.208

Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

16 files changed, 0 insertions, 1669 deletions

diff --git a/chromium/ppapi/api/dev/ppb_truetype_font_dev.idl b/chromium/ppapi/api/dev/ppb_truetype_font_dev.idl
deleted file mode 100644
index 962096f2044..00000000000
--- a/chromium/ppapi/api/dev/ppb_truetype_font_dev.idl
+++ /dev/null
@@ -1,276 +0,0 @@
-/* Copyright (c) 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.
- */
-
-/**
- * This file defines the <code>PPB_TrueTypeFont_Dev</code> interface. This
- * interface exposes font table data for 'sfnt' fonts on the host system. These
- * include TrueType and OpenType fonts.
- */
-
-[generate_thunk,thunk_include="ppapi/thunk/ppb_truetype_font_singleton_api.h"]
-
-label Chrome {
-  M26 = 0.1
-};
-
-/**
- * The PP_TrueTypeFontFamily_Dev defines generic font families. These can be
- * used to create generic fonts consistent with the user's browser settings.
- */
-[assert_size(4)]
-enum PP_TrueTypeFontFamily_Dev {
-  /**
-   * For a description of these default families, see the
-   * <a href="http://www.w3.org/TR/css3-fonts/#generic-font-families">
-   * 3.1.1 Generic font families</a> documentation.
-   */
-  PP_TRUETYPEFONTFAMILY_SERIF = 0,
-  PP_TRUETYPEFONTFAMILY_SANSSERIF = 1,
-  PP_TRUETYPEFONTFAMILY_CURSIVE = 2,
-  PP_TRUETYPEFONTFAMILY_FANTASY = 3,
-  PP_TRUETYPEFONTFAMILY_MONOSPACE = 4,
-  PP_TRUETYPEFONTFAMILY_LAST = PP_TRUETYPEFONTFAMILY_MONOSPACE
-};
-
-/**
- * The PP_TrueTypeFontStyle_Dev enum defines font styles.
- */
-[assert_size(4)]
-enum PP_TrueTypeFontStyle_Dev {
-  PP_TRUETYPEFONTSTYLE_NORMAL = 0,
-  PP_TRUETYPEFONTSTYLE_ITALIC = 1,
-  PP_TRUETYPEFONTSTYLE_LAST = PP_TRUETYPEFONTSTYLE_ITALIC
-};
-
-/**
- * The PP_TrueTypeFontWeight_Dev enum defines font weights.
- */
-[assert_size(4)]
-enum PP_TrueTypeFontWeight_Dev {
-  PP_TRUETYPEFONTWEIGHT_THIN = 100,
-  PP_TRUETYPEFONTWEIGHT_FIRST = PP_TRUETYPEFONTWEIGHT_THIN,
-  PP_TRUETYPEFONTWEIGHT_ULTRALIGHT = 200,
-  PP_TRUETYPEFONTWEIGHT_LIGHT = 300,
-  PP_TRUETYPEFONTWEIGHT_NORMAL = 400,
-  PP_TRUETYPEFONTWEIGHT_MEDIUM = 500,
-  PP_TRUETYPEFONTWEIGHT_SEMIBOLD = 600,
-  PP_TRUETYPEFONTWEIGHT_BOLD = 700,
-  PP_TRUETYPEFONTWEIGHT_ULTRABOLD = 800,
-  PP_TRUETYPEFONTWEIGHT_HEAVY = 900,
-  PP_TRUETYPEFONTWEIGHT_LAST = PP_TRUETYPEFONTWEIGHT_HEAVY
-};
-
-/**
- * The PP_TrueTypeFontWidth_Dev enum defines font widths.
- */
-[assert_size(4)]
-enum PP_TrueTypeFontWidth_Dev {
-  PP_TRUETYPEFONTWIDTH_ULTRACONDENSED = 0,
-  PP_TRUETYPEFONTWIDTH_EXTRACONDENSED = 1,
-  PP_TRUETYPEFONTWIDTH_CONDENSED = 2,
-  PP_TRUETYPEFONTWIDTH_SEMICONDENSED = 3,
-  PP_TRUETYPEFONTWIDTH_NORMAL = 4,
-  PP_TRUETYPEFONTWIDTH_SEMIEXPANDED = 5,
-  PP_TRUETYPEFONTWIDTH_EXPANDED = 6,
-  PP_TRUETYPEFONTWIDTH_EXTRAEXPANDED = 7,
-  PP_TRUETYPEFONTWIDTH_ULTRAEXPANDED = 8,
-  PP_TRUETYPEFONTWIDTH_LAST = PP_TRUETYPEFONTWIDTH_ULTRAEXPANDED
-};
-
-/**
- * The PP_TrueTypeFontCharset enum defines font character sets.
- */
-[assert_size(4)]
-enum PP_TrueTypeFontCharset_Dev {
-  PP_TRUETYPEFONTCHARSET_ANSI = 0,
-  PP_TRUETYPEFONTCHARSET_DEFAULT = 1,
-  PP_TRUETYPEFONTCHARSET_SYMBOL = 2,
-  PP_TRUETYPEFONTCHARSET_MAC = 77,
-  PP_TRUETYPEFONTCHARSET_SHIFTJIS = 128,
-  PP_TRUETYPEFONTCHARSET_HANGUL = 129,
-  PP_TRUETYPEFONTCHARSET_JOHAB = 130,
-  PP_TRUETYPEFONTCHARSET_GB2312 =134,
-  PP_TRUETYPEFONTCHARSET_CHINESEBIG5 = 136,
-  PP_TRUETYPEFONTCHARSET_GREEK = 161,
-  PP_TRUETYPEFONTCHARSET_TURKISH = 162,
-  PP_TRUETYPEFONTCHARSET_VIETNAMESE = 163,
-  PP_TRUETYPEFONTCHARSET_HEBREW = 177,
-  PP_TRUETYPEFONTCHARSET_ARABIC = 178,
-  PP_TRUETYPEFONTCHARSET_BALTIC = 186,
-  PP_TRUETYPEFONTCHARSET_RUSSIAN = 204,
-  PP_TRUETYPEFONTCHARSET_THAI = 222,
-  PP_TRUETYPEFONTCHARSET_EASTEUROPE = 238,
-  PP_TRUETYPEFONTCHARSET_OEM = 255,
-  PP_TRUETYPEFONTCHARSET_LAST = PP_TRUETYPEFONTCHARSET_OEM
-};
-
-/**
- * The <code>PP_TrueTypeFontDesc</code> struct describes a TrueType font. It is
- * passed to Create(), and returned by Describe().
- */
-[assert_size(40)]
-struct PP_TrueTypeFontDesc_Dev {
-   /**
-   * Font family name as a string. This can also be an undefined var, in which
-   * case the generic family will be obeyed. If the face is not available on
-   * the system, the browser will attempt to do font fallback or pick a default
-   * font.
-   */
-  PP_Var family;
-
-  /** This value specifies a generic font family. If a family name string is
-   * provided when creating a font, this is ignored. */
-  PP_TrueTypeFontFamily_Dev generic_family;
-
-  /** This value specifies the font style. */
-  PP_TrueTypeFontStyle_Dev style;
-
-  /** This value specifies the font weight. */
-  PP_TrueTypeFontWeight_Dev weight;
-
-  /** This value specifies the font width, for condensed or expanded fonts */
-  PP_TrueTypeFontWidth_Dev width;
-
-  /** This value specifies a character set. */
-  PP_TrueTypeFontCharset_Dev charset;
-
-  /**
-   * Ensure that this struct is 40-bytes wide by padding the end.  In some
-   * compilers, PP_Var is 8-byte aligned, so those compilers align this struct
-   * on 8-byte boundaries as well and pad it to 16 bytes even without this
-   * padding attribute.  This padding makes its size consistent across
-   * compilers.
-   */
-  int32_t padding;
-};
-
-interface PPB_TrueTypeFont_Dev {
-  /**
-   * Gets an array of TrueType font family names available on the host.
-   * These names can be used to create a font from a specific family.
-   *
-   * @param[in] instance A <code>PP_Instance</code> requesting the family names.
-   * @param[in] output A <code>PP_ArrayOutput</code> to hold the names.
-   * The output is an array of PP_Vars, each holding a family name.
-   * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
-   * completion of GetFontFamilies.
-   *
-   * @return If >= 0, the number of family names returned, otherwise an error
-   * code from <code>pp_errors.h</code>.
-   */
-  [singleton,api=PPB_TrueTypeFont_Singleton_API]
-  int32_t GetFontFamilies([in] PP_Instance instance,
-                          [in] PP_ArrayOutput output,
-                          [in] PP_CompletionCallback callback);
-
-  /**
-   * Gets an array of TrueType font descriptors for a given font family. These
-   * descriptors can be used to create a font in that family and matching the
-   * descriptor attributes.
-   *
-   * @param[in] instance A <code>PP_Instance</code> requesting the font
-   * descriptors.
-   * @param[in] family A <code>PP_Var</code> holding a string specifying the
-   * font family.
-   * @param[in] output A <code>PP_ArrayOutput</code> to hold the descriptors.
-   * The output is an array of <code>PP_TrueTypeFontDesc</code> structs. Each
-   * desc contains a PP_Var for the family name which must be released.
-   * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
-   * completion of GetFontsInFamily.
-   *
-   * @return If >= 0, the number of font descriptors returned, otherwise an
-   * error code from <code>pp_errors.h</code>.
-   */
-  [singleton,api=PPB_TrueTypeFont_Singleton_API]
-  int32_t GetFontsInFamily([in] PP_Instance instance,
-                           [in] PP_Var family,
-                           [in] PP_ArrayOutput output,
-                           [in] PP_CompletionCallback callback);
-
-  /**
-   * Creates a font resource matching the given font characteristics. The
-   * resource id will be non-zero on success, or zero on failure.
-   *
-   * @param[in] instance A <code>PP_Instance</code> to own the font.
-   * @param[in] desc A pointer to a <code>PP_TrueTypeFontDesc</code> describing
-   * the font.
-   */
-  PP_Resource Create([in] PP_Instance instance,
-                     [in] PP_TrueTypeFontDesc_Dev desc);
-
-  /**
-   * Determines if the given resource is a TrueType font.
-   *
-   * @param[in] resource A <code>PP_Resource</code> corresponding to a resource.
-   *
-   * @return <code>PP_TRUE</code> if the resource is a
-   * <code>PPB_TrueTypeFont_Dev</code>, <code>PP_FALSE</code> otherwise.
-   */
-  PP_Bool IsTrueTypeFont([in] PP_Resource resource);
-
-  /**
-   * Returns a description of the given font resource. This description may
-   * differ from the description passed to Create, reflecting the host's font
-   * matching and fallback algorithm.
-   *
-   * @param[in] font A <code>PP_Resource</code> corresponding to a font.
-   * @param[out] desc A pointer to a <code>PP_TrueTypeFontDesc</code> to hold
-   * the description. The internal 'family' PP_Var should be set to undefined,
-   * since this function overwrites the <code>PP_TrueTypeFontDesc</code>. After
-   * successful completion, the family will be set to a PP_Var with a single
-   * reference, which the caller must release after use.
-   * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
-   * completion of Describe.
-   *
-   * @return A return code from <code>pp_errors.h</code>. If an error code is
-   * returned, the <code>PP_TrueTypeFontDesc</code> will be unchanged.
-   */
-  int32_t Describe([in] PP_Resource font,
-                   [out] PP_TrueTypeFontDesc_Dev desc,
-                   [in] PP_CompletionCallback callback);
-
-  /**
-   * Gets an array of identifying tags for each table in the font. These tags
-   * can be used to request specific tables using GetTable.
-   *
-   * @param[in] font A <code>PP_Resource</code> corresponding to a font.
-   * @param[in] output A <code>PP_ArrayOutput</code> to hold the tags.
-   * The output is an array of 4 byte integers, each representing a table tag.
-   * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
-   * completion of GetTableTags.
-   *
-   * @return If >= 0, the number of table tags returned, otherwise an error
-   * code from <code>pp_errors.h</code>.
-   */
-  int32_t GetTableTags([in] PP_Resource font,
-                       [in] PP_ArrayOutput output,
-                       [in] PP_CompletionCallback callback);
-
-  /**
-   * Copies the given font table into client memory.
-   *
-   * @param[in] font A <code>PP_Resource</code> corresponding to a font.
-   * @param[in] table A 4 byte value indicating which table to copy.
-   * For example, 'glyf' will cause the outline table to be copied into the
-   * output array. A zero tag value will cause the entire font to be copied.
-   * @param[in] offset The offset into the font table. Passing an offset
-   * greater than or equal to the table size will succeed with 0 bytes copied.
-   * @param[in] max_data_length The maximum number of bytes to transfer from
-   * <code>offset</code>.
-   * @param[in] output A <code>PP_ArrayOutput</code> to hold the font data.
-   * The output is an array of bytes.
-   * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
-   * completion of GetTable.
-   *
-   * @return If >= 0, the table size in bytes, otherwise an error code from
-   * <code>pp_errors.h</code>.
-   */
-  int32_t GetTable([in] PP_Resource font,
-                   [in] uint32_t table,
-                   [in] int32_t offset,
-                   [in] int32_t max_data_length,
-                   [in] PP_ArrayOutput output,
-                   [in] PP_CompletionCallback callback);
-};
diff --git a/chromium/ppapi/api/pp_codecs.idl b/chromium/ppapi/api/pp_codecs.idl
index 8699ec9853d..0bdbf4d8b3c 100644
--- a/chromium/ppapi/api/pp_codecs.idl
+++ b/chromium/ppapi/api/pp_codecs.idl
@@ -24,14 +24,6 @@ enum PP_VideoProfile {
 };
 
 /**
- * Audio profiles.
- */
-enum PP_AudioProfile {
-  PP_AUDIOPROFILE_OPUS = 0,
-  PP_AUDIOPROFILE_MAX = PP_AUDIOPROFILE_OPUS
-};
-
-/**
  * Hardware acceleration options.
  */
 enum PP_HardwareAcceleration {
@@ -188,37 +180,6 @@ struct PP_VideoProfileDescription_0_1 {
 };
 
 /**
- * Supported audio profile information. See the PPB_AudioEncoder function
- * GetSupportedProfiles() for more details.
- */
-struct PP_AudioProfileDescription {
-  /**
-   * The codec profile.
-   */
-  PP_AudioProfile profile;
-
-  /**
-   * Maximum number of channels that can be encoded.
-   */
-  uint32_t max_channels;
-
-  /**
-   * Sample size.
-   */
-  uint32_t sample_size;
-
-  /**
-   * Sampling rate that can be encoded
-   */
-  uint32_t sample_rate;
-
-  /**
-   * Whether the profile is hardware accelerated.
-   */
-  PP_Bool hardware_accelerated;
-};
-
-/**
  * Struct describing a bitstream buffer.
  */
 struct PP_BitstreamBuffer {
diff --git a/chromium/ppapi/api/ppb_audio_encoder.idl b/chromium/ppapi/api/ppb_audio_encoder.idl
deleted file mode 100644
index 0a8029fcd38..00000000000
--- a/chromium/ppapi/api/ppb_audio_encoder.idl
+++ /dev/null
@@ -1,209 +0,0 @@
-/* Copyright 2015 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 defines the <code>PPB_AudioEncoder</code> interface.
- */
-
-[generate_thunk]
-
-label Chrome {
-  [channel=dev] M47 = 0.1
-};
-
-/**
- * Audio encoder interface.
- *
- * Typical usage:
- * - Call Create() to create a new audio encoder resource.
- * - Call GetSupportedProfiles() to determine which codecs and profiles are
- *   available.
- * - Call Initialize() to initialize the encoder for a supported profile.
- * - Call GetBuffer() to get an empty buffer and fill it in, or get an audio
- *   buffer from another resource, e.g. <code>PPB_MediaStreamAudioTrack</code>.
- * - Call Encode() to push the audio buffer to the encoder. If an external
- *   buffer is pushed, wait for completion to recycle the buffer.
- * - Call GetBitstreamBuffer() continuously (waiting for each previous call to
- *   complete) to pull encoded buffers from the encoder.
- * - Call RecycleBitstreamBuffer() after consuming the data in the bitstream
- *   buffer.
- * - To destroy the encoder, the plugin should release all of its references to
- *   it. Any pending callbacks will abort before the encoder is destroyed.
- *
- * Available audio codecs vary by platform.
- * All: opus.
- */
-interface PPB_AudioEncoder {
-  /**
-   * Creates a new audio encoder resource.
-   *
-   * @param[in] instance A <code>PP_Instance</code> identifying the instance
-   * with the audio encoder.
-   *
-   * @return A <code>PP_Resource</code> corresponding to an audio encoder if
-   * successful or 0 otherwise.
-   */
-  PP_Resource Create([in] PP_Instance instance);
-
-  /**
-   * Determines if the given resource is an audio encoder.
-   *
-   * @param[in] resource A <code>PP_Resource</code> identifying a resource.
-   *
-   * @return <code>PP_TRUE</code> if the resource is a
-   * <code>PPB_AudioEncoder</code>, <code>PP_FALSE</code> if the resource is
-   * invalid or some other type.
-   */
-  PP_Bool IsAudioEncoder([in] PP_Resource resource);
-
-  /**
-   * Gets an array of supported audio encoder profiles.
-   * These can be used to choose a profile before calling Initialize().
-   *
-   * @param[in] audio_encoder A <code>PP_Resource</code> identifying the audio
-   * encoder.
-   * @param[in] output A <code>PP_ArrayOutput</code> to receive the supported
-   * <code>PP_AudioProfileDescription</code> structs.
-   * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
-   * completion.
-   *
-   * @return If >= 0, the number of supported profiles returned, otherwise an
-   * error code from <code>pp_errors.h</code>.
-   */
-  int32_t GetSupportedProfiles([in] PP_Resource audio_encoder,
-                               [in] PP_ArrayOutput output,
-                               [in] PP_CompletionCallback callback);
-
-  /**
-   * Initializes an audio encoder resource. The plugin should call Initialize()
-   * successfully before calling any of the functions below.
-   *
-   * @param[in] audio_encoder A <code>PP_Resource</code> identifying the audio
-   * encoder.
-   * @param[in] channels The number of audio channels to encode.
-   * @param[in] input_sampling_rate The sampling rate of the input audio buffer.
-   * @param[in] input_sample_size The sample size of the input audio buffer.
-   * @param[in] output_profile A <code>PP_AudioProfile</code> specifying the
-   * codec profile of the encoded output stream.
-   * @param[in] initial_bitrate The initial bitrate for the encoder.
-   * @param[in] acceleration A <code>PP_HardwareAcceleration</code> specifying
-   * whether to use a hardware accelerated or a software implementation.
-   * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
-   * completion.
-   *
-   * @return An int32_t containing an error code from <code>pp_errors.h</code>.
-   * Returns PP_ERROR_NOTSUPPORTED if audio encoding is not available, or the
-   * requested codec profile is not supported.
-   */
-  int32_t Initialize([in] PP_Resource audio_encoder,
-                     [in] uint32_t channels,
-                     [in] PP_AudioBuffer_SampleRate input_sample_rate,
-                     [in] PP_AudioBuffer_SampleSize input_sample_size,
-                     [in] PP_AudioProfile output_profile,
-                     [in] uint32_t initial_bitrate,
-                     [in] PP_HardwareAcceleration acceleration,
-                     [in] PP_CompletionCallback callback);
-
-  /**
-   * Gets the number of audio samples per channel that audio buffers must
-   * contain in order to be processed by the encoder. This will be the number of
-   * samples per channels contained in buffers returned by GetBuffer().
-   *
-   * @param[in] audio_encoder A <code>PP_Resource</code> identifying the audio
-   * encoder.
-   * @return An int32_t containing the number of samples required, or an error
-   * code from <code>pp_errors.h</code>.
-   * Returns PP_ERROR_FAILED if Initialize() has not successfully completed.
-   */
-  int32_t GetNumberOfSamples([in] PP_Resource audio_encoder);
-
-  /**
-   * Gets a blank audio buffer (with metadata given by the Initialize()
-   * call) which can be filled with audio data and passed to the encoder.
-   *
-   * @param[in] audio_encoder A <code>PP_Resource</code> identifying the audio
-   * encoder.
-   * @param[out] audio_buffer A blank <code>PPB_AudioBuffer</code> resource.
-   * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
-   * completion.
-   *
-   * @return An int32_t containing an error code from <code>pp_errors.h</code>.
-   * Returns PP_ERROR_FAILED if Initialize() has not successfully completed.
-   */
-  int32_t GetBuffer([in] PP_Resource audio_encoder,
-                    [out] PP_Resource audio_buffer,
-                    [in] PP_CompletionCallback callback);
-
-  /**
-   * Encodes an audio buffer.
-   *
-   * @param[in] audio_encoder A <code>PP_Resource</code> identifying the audio
-   * encoder.
-   * @param[in] audio_buffer The <code>PPB_AudioBuffer</code> to be encoded.
-   * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
-   * completion. Plugins that pass <code>PPB_AudioBuffer</code> resources owned
-   * by other resources should wait for completion before reusing them.
-   *
-   * @return An int32_t containing an error code from <code>pp_errors.h</code>.
-   * Returns PP_ERROR_FAILED if Initialize() has not successfully completed.
-   */
-  int32_t Encode([in] PP_Resource audio_encoder,
-                 [in] PP_Resource audio_buffer,
-                 [in] PP_CompletionCallback callback);
-
-  /**
-   * Gets the next encoded bitstream buffer from the encoder.
-   *
-   * @param[in] audio_encoder A <code>PP_Resource</code> identifying the audio
-   * encoder.
-   * @param[out] bitstream_buffer A <code>PP_BitstreamBuffer</code> containing
-   * encoded audio data.
-   * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
-   * completion. The plugin can call GetBitstreamBuffer from the callback in
-   * order to continuously "pull" bitstream buffers from the encoder.
-   *
-   * @return An int32_t containing an error code from <code>pp_errors.h</code>.
-   * Returns PP_ERROR_FAILED if Initialize() has not successfully completed.
-   * Returns PP_ERROR_INPROGRESS if a prior call to GetBitstreamBuffer() has
-   * not completed.
-   */
-  int32_t GetBitstreamBuffer([in] PP_Resource audio_encoder,
-                             [out] PP_AudioBitstreamBuffer bitstream_buffer,
-                             [in] PP_CompletionCallback callback);
-
-  /**
-   * Recycles a bitstream buffer back to the encoder.
-   *
-   * @param[in] audio_encoder A <code>PP_Resource</code> identifying the audio
-   * encoder.
-   * @param[in] bitstream_buffer A <code>PP_BitstreamBuffer</code> that is no
-   * longer needed by the plugin.
-   */
-  void RecycleBitstreamBuffer([in] PP_Resource audio_encoder,
-                              [in] PP_AudioBitstreamBuffer bitstream_buffer);
-
-  /**
-   * Requests a change to the encoding bitrate. This is only a request,
-   * fulfilled on a best-effort basis.
-   *
-   * @param[in] audio_encoder A <code>PP_Resource</code> identifying the audio
-   * encoder.
-   * @param[in] bitrate The requested new bitrate, in bits per second.
-   */
-  void RequestBitrateChange([in] PP_Resource audio_encoder,
-                            [in] uint32_t bitrate);
-
-  /**
-   * Closes the audio encoder, and cancels any pending encodes. Any pending
-   * callbacks will still run, reporting <code>PP_ERROR_ABORTED</code> . It is
-   * not valid to call any encoder functions after a call to this method.
-   * <strong>Note:</strong> Destroying the audio encoder closes it implicitly,
-   * so you are not required to call Close().
-   *
-   * @param[in] audio_encoder A <code>PP_Resource</code> identifying the audio
-   * encoder.
-   */
-  void Close([in] PP_Resource audio_encoder);
-};
diff --git a/chromium/ppapi/api/private/finish_writing_these/ppb_flash_file.idl b/chromium/ppapi/api/private/finish_writing_these/ppb_flash_file.idl
deleted file mode 100644
index cf6fe8fb167..00000000000
--- a/chromium/ppapi/api/private/finish_writing_these/ppb_flash_file.idl
+++ /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.
- */
-
-/* This file contains PPB_Flash_File interface. */
-
-/* A directory entry. */
-struct PP_DirEntry_Dev {
-  str_t name;
-  PP_Bool is_dir;
-};
-
-/* Directory. */
-struct PP_DirContents_Dev {
-  int32_t count;
-  [size_is(count)] PP_DirEntry_Dev[] entries;
-};
-
-/* PPB_Flash_File_ModuleLocal */
-interface PPB_Flash_File_ModuleLocal_0_1 {
-  /* Opens a module-local file, returning a file descriptor (posix) or a HANDLE
-   * (win32) into file. Module-local file paths (here and below) are
-   * '/'-separated UTF-8 strings, relative to a module-specific root. The return
-   * value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in case
-   * of failure
-   */
-  int32_t OpenFile(
-      [in] PP_Instance instance,
-      [in] str_t path,
-      [in] int32_t mode,
-      [out] PP_FileHandle file);
-
-  /* Renames a module-local file. The return value is the ppapi error, PP_OK if
-   * success, one of the PP_ERROR_* in case of failure.
-   */
-  int32_t RenameFile(
-      [in] PP_Instance instance,
-      [in] str_t path_from,
-      [in] str_t path_to);
-
-  /* Deletes a module-local file or directory. If recursive is set and the path
-   * points to a directory, deletes all the contents of the directory. The
-   * return value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in
-   * case of failure.
-   */
-  int32_t DeleteFileOrDir(
-      [in] PP_Instance instance,
-      [in] str_t path,
-      [in] PP_Bool recursive);
-
-  /* Creates a module-local directory. The return value is the ppapi error,
-   * PP_OK if success, one of the PP_ERROR_* in case of failure.
-   */
-  int32_t CreateDir(
-      [in] PP_Instance instance,
-      [in] str_t path);
-
-  /* Queries information about a module-local file. The return value is the
-   * ppapi error, PP_OK if success, one of the PP_ERROR_* in case of failure.
-   */
-  int32_t QueryFile(
-      [in] PP_Instance instance,
-      [in] str_t path,
-      [out] PP_FileInfo info);
-
-  /* Gets the list of files contained in a module-local directory. The return
-   * value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in case
-   * of failure. If non-NULL, the returned contents should be freed with
-   * FreeDirContents.
-   */
-  int32_t GetDirContents(
-      [in] PP_Instance instance,
-      [in] str_t path,
-      [out] PP_DirContents_Dev contents);
-
-  /* Frees the data allocated by GetDirContents. */
-  void FreeDirContents(
-      [in] PP_Instance instance,
-      [in] PP_DirContents_Dev contents);
-};
diff --git a/chromium/ppapi/api/private/finish_writing_these/ppb_proxy_private.idl b/chromium/ppapi/api/private/finish_writing_these/ppb_proxy_private.idl
deleted file mode 100644
index f0173ebc736..00000000000
--- a/chromium/ppapi/api/private/finish_writing_these/ppb_proxy_private.idl
+++ /dev/null
@@ -1,17 +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.
- */
-
-/* Exposes functions needed by the out-of-process proxy to call into the
- * renderer PPAPI implementation.
- */
-interface PPB_Proxy_Private_0_2 {
-  /* Called when the given plugin process has crashed. */
-  void PluginCrashed(
-      [in] PP_Module module);
-
-  /* Returns the instance for the given resource, or 0 on failure. */
-  PP_Instance GetInstanceForResource(
-      [in] PP_Resource resource);
-};
diff --git a/chromium/ppapi/api/private/ppb_flash.idl b/chromium/ppapi/api/private/ppb_flash.idl
deleted file mode 100644
index 1138bcacb49..00000000000
--- a/chromium/ppapi/api/private/ppb_flash.idl
+++ /dev/null
@@ -1,276 +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_Flash</code> interface.
- */
-
-label Chrome {
-  M21 = 12.4,
-  M22 = 12.5,
-  M24_0 = 12.6,
-  M24_1 = 13.0
-};
-
-[assert_size(4)]
-enum PP_FlashLSORestrictions {
-  /**
-   * No restrictions on Flash LSOs.
-   */
-  PP_FLASHLSORESTRICTIONS_NONE = 1,
-
-  /**
-   * Don't allow access to Flash LSOs.
-   */
-  PP_FLASHLSORESTRICTIONS_BLOCK = 2,
-
-  /**
-   * Store Flash LSOs in memory only.
-   */
-  PP_FLASHLSORESTRICTIONS_IN_MEMORY = 3
-};
-
-[assert_size(4)]
-enum PP_FlashSetting {
-  /**
-   * Specifies if the system likely supports 3D hardware acceleration.
-   *
-   * The result is a boolean PP_Var, depending on the supported nature of 3D
-   * acceleration. If querying this function returns true, the 3D system will
-   * normally use the native hardware for rendering which will be much faster.
-   *
-   * Having this set to true only means that 3D should be used to draw 2D and
-   * video elements. PP_FLASHSETTING_STAGE3D_ENABLED should be checked to
-   * determine if it's ok to use 3D for arbitrary content.
-   *
-   * In rare cases (depending on the platform) this value will be true but a
-   * created 3D context will use emulation because context initialization
-   * failed.
-   */
-  PP_FLASHSETTING_3DENABLED = 1,
-  PP_FLASHSETTING_FIRST = PP_FLASHSETTING_3DENABLED,
-
-  /**
-   * Specifies if the given instance is in private/incognito/off-the-record mode
-   * (returns true) or "regular" mode (returns false). Returns an undefined
-   * PP_Var on invalid instance.
-   */
-  PP_FLASHSETTING_INCOGNITO = 2,
-
-  /**
-   * Specifies if arbitrary 3d commands are supported (returns true), or if 3d
-   * should only be used for drawing 2d and video (returns false).
-   *
-   * This should only be enabled if PP_FLASHSETTING_3DENABLED is true.
-   */
-  PP_FLASHSETTING_STAGE3DENABLED = 3,
-
-  /**
-   * Specifies the string for the language code of the UI of the browser.
-   *
-   * For example: "en-US" or "de".
-   *
-   * Returns an undefined PP_Var on invalid instance.
-   */
-  PP_FLASHSETTING_LANGUAGE = 4,
-
-  /**
-   * Specifies the number of CPU cores that are present on the system.
-   */
-  PP_FLASHSETTING_NUMCORES = 5,
-
-  /**
-   * Specifies restrictions on how flash should handle LSOs. The result is an
-   * int from <code>PP_FlashLSORestrictions</code>.
-   */
-  PP_FLASHSETTING_LSORESTRICTIONS = 6,
-
-  /**
-   * Specifies if the driver is reliable enough to use Shader Model 3 commands
-   * with it.
-   *
-   * This should only be enabled if PP_FLASHSETTING_STAGE3DENABLED is true.
-   */
-  PP_FLASHSETTING_STAGE3DBASELINEENABLED = 7,
-  PP_FLASHSETTING_LAST = PP_FLASHSETTING_STAGE3DBASELINEENABLED
-};
-
-/**
- * This enum provides keys for setting breakpad crash report data.
- */
-[assert_size(4)]
-enum PP_FlashCrashKey {
-  /**
-   * Specifies the document URL which contains the flash instance.
-   */
-  PP_FLASHCRASHKEY_URL = 1,
-
-  /**
-   * Specifies the URL of the current swf.
-   */
-  PP_FLASHCRASHKEY_RESOURCE_URL = 2
-};
-
-/**
- * The <code>PPB_Flash</code> interface contains pointers to various functions
- * that are only needed to support Pepper Flash.
- */
-interface PPB_Flash {
-  /**
-   * Sets or clears the rendering hint that the given plugin instance is always
-   * on top of page content. Somewhat more optimized painting can be used in
-   * this case.
-   */
-  void SetInstanceAlwaysOnTop(
-      [in] PP_Instance instance,
-      [in] PP_Bool on_top);
-
-  /**
-   * Draws the given pre-laid-out text. It is almost equivalent to Windows'
-   * ExtTextOut with the addition of the transformation (a 3x3 matrix given the
-   * transform to apply before drawing). It also adds the allow_subpixel_aa
-   * flag which when true, will use subpixel antialiasing if enabled in the
-   * system settings. For this to work properly, the graphics layer that the
-   * text is being drawn into must be opaque.
-   */
-  PP_Bool DrawGlyphs(
-      [in] PP_Instance instance,
-      [in] PP_Resource pp_image_data,
-      [in] PP_BrowserFont_Trusted_Description font_desc,
-      [in] uint32_t color,
-      [in] PP_Point position,
-      [in] PP_Rect clip,
-      [in] float_t[3][3] transformation,
-      [in] PP_Bool allow_subpixel_aa,
-      [in] uint32_t glyph_count,
-      [in, size_is(glyph_count)] uint16_t[] glyph_indices,
-      [in, size_is(glyph_count)] PP_Point[] glyph_advances);
-
-  /**
-   * Retrieves the proxy that will be used for the given URL. The result will
-   * be a string in PAC format, or an undefined var on error.
-   */
-  PP_Var GetProxyForURL(
-      [in] PP_Instance instance,
-      [in] str_t url);
-
-  /**
-   * Navigate to the URL given by the given URLRequestInfo. (This supports GETs,
-   * POSTs, and javascript: URLs.) May open a new tab if target is not "_self".
-   */
-  int32_t Navigate(
-      [in] PP_Resource request_info,
-      [in] str_t target,
-      [in] PP_Bool from_user_action);
-
-  /**
-   * Deprecated. Does nothing. Use PPB_Flash_MessageLoop.
-   */
-  [deprecate=13.0]
-  void RunMessageLoop(
-      [in] PP_Instance instance);
-
-  /**
-   * Deprecated. Does nothing. Use PPB_Flash_MessageLoop.
-   */
-  [deprecate=13.0]
-  void QuitMessageLoop(
-      [in] PP_Instance instance);
-
-  /**
-   * Retrieves the local time zone offset from GM time for the given UTC time.
-   */
-  double_t GetLocalTimeZoneOffset(
-      [in] PP_Instance instance,
-      [in] PP_Time t);
-
-  /**
-   * Gets a (string) with "command-line" options for Flash; used to pass
-   * run-time debugging parameters, etc.
-   */
-  PP_Var GetCommandLineArgs(
-      [in] PP_Module module);
-
-  /**
-   * Loads the given font in a more privileged process on Windows. Call this if
-   * Windows is giving errors for font calls. See
-   * content/renderer/font_cache_dispatcher_win.cc
-   *
-   * The parameter is a pointer to a LOGFONTW structure.
-   *
-   * On non-Windows platforms, this function does nothing.
-   */
-  void PreloadFontWin(
-      [in] mem_t logfontw);
-
-  /**
-   * Returns whether the given rectangle (in the plugin) is topmost, i.e., above
-   * all other web content.
-   */
-  PP_Bool IsRectTopmost(
-      [in] PP_Instance instance,
-      [in] PP_Rect rect);
-
-  /**
-   * Deprecated. Does nothing. Use PPB_Flash_Print.
-   */
-  [deprecate=13.0]
-  int32_t InvokePrinting(
-      [in] PP_Instance instance);
-
-  /**
-   * Indicates that there's activity and, e.g., the screensaver shouldn't kick
-   * in.
-   */
-  void UpdateActivity(
-      [in] PP_Instance instance);
-
-  /**
-   * Deprecated. Does nothing.
-   */
-  [deprecate=13.0]
-  PP_Var GetDeviceID([in] PP_Instance instance);
-
-  /**
-   * Deprecated. Does nothing. See GetSetting().
-   */
-  [deprecate=13.0]
-  int32_t GetSettingInt([in] PP_Instance instance,
-                        [in] PP_FlashSetting setting);
-
-  /**
-   * Returns the value associated with the given setting. Invalid enums will
-   * result in an undefined PP_Var return value.
-   */
-  PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting);
-
-  /**
-   * Allows setting breakpad crash data which will be included in plugin crash
-   * reports. Returns PP_FALSE if crash data could not be set.
-   */
-  [version=12.5]
-  PP_Bool SetCrashData([in] PP_Instance instance,
-                       [in] PP_FlashCrashKey key,
-                       [in] PP_Var value);
-
-  /**
-   * Enumerates video capture devices. |video_capture| is a valid
-   * PPB_VideoCapture_Dev resource. Once the operation has completed
-   * successfully, |devices| will be set up with an array of
-   * PPB_DeviceRef_Dev resources.
-   *
-   * PP_OK is returned on success and different pepper error code on failure.
-   * The ref count of the returned |devices| has already been increased by 1 for
-   * the caller.
-   *
-   * NOTE: This method is a synchronous version of |EnumerateDevices| in
-   * PPB_VideoCapture_Dev.
-   */
-  [version=12.6]
-  int32_t EnumerateVideoCaptureDevices(
-      [in] PP_Instance instance,
-      [in] PP_Resource video_capture,
-      [in] PP_ArrayOutput devices);
-};
diff --git a/chromium/ppapi/api/private/ppb_flash_clipboard.idl b/chromium/ppapi/api/private/ppb_flash_clipboard.idl
deleted file mode 100644
index d2fef48a074..00000000000
--- a/chromium/ppapi/api/private/ppb_flash_clipboard.idl
+++ /dev/null
@@ -1,157 +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 defines the private <code>PPB_Flash_Clipboard</code> API used by
- * Pepper Flash for reading and writing to the clipboard.
- */
-
-label Chrome {
-  M19 = 4.0,
-  M24 = 5.0,
-  M34 = 5.1
-};
-
-/**
- * This enumeration contains the types of clipboards that can be accessed.
- * These types correspond to clipboard types in WebKit.
- */
-[assert_size(4)]
-enum PP_Flash_Clipboard_Type {
-  /** The standard clipboard. */
-  PP_FLASH_CLIPBOARD_TYPE_STANDARD = 0,
-  /** The selection clipboard (e.g., on Linux). */
-  PP_FLASH_CLIPBOARD_TYPE_SELECTION = 1
-};
-
-/**
- * This enumeration contains the predefined clipboard data formats.
- */
-[assert_size(4)]
-enum PP_Flash_Clipboard_Format {
-  /** Indicates an invalid or unsupported clipboard data format. */
-  PP_FLASH_CLIPBOARD_FORMAT_INVALID = 0,
-  /**
-   * Indicates plaintext clipboard data. The format expected/returned is a
-   * <code>PP_VARTYPE_STRING</code>.
-   */
-  PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT = 1,
-  /**
-   * Indicates HTML clipboard data. The format expected/returned is a
-   * <code>PP_VARTYPE_STRING</code>.
-   */
-  PP_FLASH_CLIPBOARD_FORMAT_HTML = 2,
-  /**
-   * Indicates RTF clipboard data. The format expected/returned is a
-   * <code>PP_VARTYPE_ARRAY_BUFFER</code>.
-   */
-  PP_FLASH_CLIPBOARD_FORMAT_RTF = 3
-};
-
-/**
- * The <code>PPB_Flash_Clipboard</code> interface contains pointers to functions
- * used by Pepper Flash to access the clipboard.
- *
- */
-interface PPB_Flash_Clipboard {
-  /**
-   * Deprecated in 5.0.
-   */
-  [version=4.0, deprecate=5.0]
-  PP_Bool IsFormatAvailable(
-      [in] PP_Instance instance_id,
-      [in] PP_Flash_Clipboard_Type clipboard_type,
-      [in] PP_Flash_Clipboard_Format format);
-
-  /**
-   * Deprecated in 5.0.
-   */
-  [version=4.0, deprecate=5.0]
-  PP_Var ReadData([in] PP_Instance instance_id,
-      [in] PP_Flash_Clipboard_Type clipboard_type,
-      [in] PP_Flash_Clipboard_Format format);
-
-  /**
-   * Deprecated in 5.0.
-   */
-  [version=4.0, deprecate=5.0]
-  int32_t WriteData([in] PP_Instance instance_id,
-      [in] PP_Flash_Clipboard_Type clipboard_type,
-      [in] uint32_t data_item_count,
-      [in, size_is(data_item_count)] PP_Flash_Clipboard_Format[] formats,
-      [in, size_is(data_item_count)] PP_Var[] data_items);
-
-  /**
-   * Registers a custom clipboard format. The format is identified by a
-   * string. An id identifying the format will be returned if the format is
-   * successfully registered, which can be used to read/write data of that
-   * format. If the format has already been registered, the id associated with
-   * that format will be returned. If the format fails to be registered
-   * <code>PP_FLASH_CLIPBOARD_FORMAT_INVALID</code> will be returned.
-   *
-   * All custom data should be read/written as <code>PP_Var</code> array
-   * buffers. The clipboard format is pepper-specific meaning that although the
-   * data will be stored on the system clipboard, it can only be accessed in a
-   * sensible way by using the pepper API. Data stored in custom formats can
-   * be safely shared between different applications that use pepper.
-   */
-  [version=5.0]
-  uint32_t RegisterCustomFormat(
-      [in] PP_Instance instance_id,
-      [in] str_t format_name);
-
-  /**
-   * Checks whether a given data format is available from the given clipboard.
-   * Returns true if the given format is available from the given clipboard.
-   */
-  [version=5.0]
-  PP_Bool IsFormatAvailable(
-      [in] PP_Instance instance_id,
-      [in] PP_Flash_Clipboard_Type clipboard_type,
-      [in] uint32_t format);
-
-  /**
-   * Reads data in the given <code>format</code> from the clipboard. An
-   * undefined <code>PP_Var</code> is returned if there is an error in reading
-   * the clipboard data and a null <code>PP_Var</code> is returned if there is
-   * no data of the specified <code>format</code> to read.
-   */
-  [version=5.0]
-  PP_Var ReadData([in] PP_Instance instance_id,
-      [in] PP_Flash_Clipboard_Type clipboard_type,
-      [in] uint32_t format);
-
-  /**
-   * Writes the given array of data items to the clipboard. All existing
-   * clipboard data in any format is erased before writing this data. Thus,
-   * passing an array of size 0 has the effect of clearing the clipboard without
-   * writing any data. Each data item in the array should have a different
-   * <code>PP_Flash_Clipboard_Format</code>. If multiple data items have the
-   * same format, only the last item with that format will be written.
-   * If there is an error writing any of the items in the array to the
-   * clipboard, none will be written and an error code is returned.
-   * The error code will be <code>PP_ERROR_NOSPACE</code> if the value is
-   * too large to be written, <code>PP_ERROR_BADARGUMENT</code> if a PP_Var
-   * cannot be converted into the format supplied or <code>PP_FAILED</code>
-   * if the format is not supported.
-   */
-  [version=5.0]
-  int32_t WriteData([in] PP_Instance instance_id,
-      [in] PP_Flash_Clipboard_Type clipboard_type,
-      [in] uint32_t data_item_count,
-      [in, size_is(data_item_count)] uint32_t[] formats,
-      [in, size_is(data_item_count)] PP_Var[] data_items);
-
-  /**
-   * Gets a sequence number which uniquely identifies clipboard state. This can
-   * be used to version the data on the clipboard and determine whether it has
-   * changed. The sequence number will be placed in |sequence_number| and
-   * PP_TRUE returned if the sequence number was retrieved successfully.
-   */
-  [version=5.1]
-  PP_Bool GetSequenceNumber([in] PP_Instance instance_id,
-                            [in] PP_Flash_Clipboard_Type clipboard_type,
-                            [out] uint64_t sequence_number);
-};
diff --git a/chromium/ppapi/api/private/ppb_flash_drm.idl b/chromium/ppapi/api/private/ppb_flash_drm.idl
deleted file mode 100644
index 23b7fa9d9ea..00000000000
--- a/chromium/ppapi/api/private/ppb_flash_drm.idl
+++ /dev/null
@@ -1,64 +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_Flash_DRM</code> interface.
- */
-
-[generate_thunk]
-
-label Chrome {
-  M33 = 1.1
-};
-
-/**
- * A resource for performing Flash DRM-related operations.
- */
-interface PPB_Flash_DRM {
-  /**
-   * Creates a PPB_Flash_DRM resource for performing DRM-related operations in
-   * Flash.
-   */
-  PP_Resource Create([in] PP_Instance instance);
-
-  /**
-   * Asynchronously computes the device ID. When available, it will place the
-   * string in |*id| and will call the completion callback. On failure the
-   * given var will be PP_VARTYPE_UNDEFINED.
-   */
-  int32_t GetDeviceID([in] PP_Resource drm,
-                      [out] PP_Var id,
-                      [in] PP_CompletionCallback callback);
-
-  /**
-   * Windows and Mac only. Synchronously outputs the HMONITOR or
-   * CGDirectDisplayID corresponding to the monitor on which the plugin instance
-   * is displayed in |hmonitor|. This value is queried asynchronously and this
-   * will return PP_FALSE if the value is not yet available or an error
-   * occurred. PP_TRUE is returned on success.
-   */
-  PP_Bool GetHmonitor([in] PP_Resource drm,
-                      [out] int64_t hmonitor);
-
-  /**
-   * Asynchronously returns a PPB_FileRef resource in |file_ref| which points to
-   * the Voucher file for performing DRM verification. |callback| will be called
-   * upon completion.
-   */
-   int32_t GetVoucherFile([in] PP_Resource drm,
-                          [out] PP_Resource file_ref,
-                          [in] PP_CompletionCallback callback);
-
-  /**
-   * Asynchronously returns a value indicating whether the monitor on which the
-   * plugin instance is displayed is external. |callback| will be called upon
-   * completion.
-   */
-   [version=1.1]
-   int32_t MonitorIsExternal([in] PP_Resource drm,
-                             [out] PP_Bool is_external,
-                             [in] PP_CompletionCallback callback);
-};
-
diff --git a/chromium/ppapi/api/private/ppb_flash_fullscreen.idl b/chromium/ppapi/api/private/ppb_flash_fullscreen.idl
deleted file mode 100644
index 1ea7715d844..00000000000
--- a/chromium/ppapi/api/private/ppb_flash_fullscreen.idl
+++ /dev/null
@@ -1,45 +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 defines the <code>PPB_FlashFullscreen</code> interface.
- */
-
-label Chrome {
-  M23 = 1.0
-};
-
-interface PPB_FlashFullscreen {
-  /**
-   * Checks whether the plugin instance is currently in fullscreen mode.
-   */
-  PP_Bool IsFullscreen(
-      [in] PP_Instance instance);
-
-  /**
-   * Switches the plugin instance to/from fullscreen mode. Returns PP_TRUE on
-   * success, PP_FALSE on failure.
-   *
-   * This does not unbind the current Graphics2D or Graphics3D. Pending flushes
-   * and swapbuffers will execute as if the resource was off-screen. The
-   * transition is asynchronous. During the transition, IsFullscreen will
-   * return PP_FALSE, and no Graphics2D or Graphics3D can be bound. The
-   * transition ends at the next DidChangeView when going into fullscreen mode.
-   * The transition out of fullscreen mode is synchronous.
-   */
-  PP_Bool SetFullscreen(
-      [in] PP_Instance instance,
-      [in] PP_Bool fullscreen);
-
-  /**
-   * Gets the size of the screen in pixels. When going fullscreen, the instance
-   * will be resized to that size.
-   */
-  PP_Bool GetScreenSize(
-      [in] PP_Instance instance,
-      [out] PP_Size size);
-};
-
diff --git a/chromium/ppapi/api/private/ppb_flash_menu.idl b/chromium/ppapi/api/private/ppb_flash_menu.idl
deleted file mode 100644
index 253d8bd722f..00000000000
--- a/chromium/ppapi/api/private/ppb_flash_menu.idl
+++ /dev/null
@@ -1,54 +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 defines the <code>PPB_Flash_Menu</code> interface.
- */
-label Chrome {
-  M14 = 0.2
-};
-
-/* Menu item type.
- *
- * TODO(viettrungluu): Radio items not supported yet. Will also probably want
- * special menu items tied to clipboard access.
- */
-[assert_size(4)]
-enum PP_Flash_MenuItem_Type {
-  PP_FLASH_MENUITEM_TYPE_NORMAL = 0,
-  PP_FLASH_MENUITEM_TYPE_CHECKBOX = 1,
-  PP_FLASH_MENUITEM_TYPE_SEPARATOR = 2,
-  PP_FLASH_MENUITEM_TYPE_SUBMENU = 3
-};
-
-struct PP_Flash_MenuItem {
-  PP_Flash_MenuItem_Type type;
-  str_t name;
-  int32_t id;
-  PP_Bool enabled;
-  PP_Bool checked;
-  [ref] PP_Flash_Menu submenu;
-};
-
-struct PP_Flash_Menu {
-  uint32_t count;
-  [size_is(count)] PP_Flash_MenuItem[] items;
-};
-
-interface PPB_Flash_Menu {
-  PP_Resource Create([in] PP_Instance instance_id,
-                     [in] PP_Flash_Menu menu_data);
-  PP_Bool IsFlashMenu(PP_Resource resource_id);
-  /* Display a context menu at the given location. If the user selects an item,
-   * |selected_id| will be set to its |id| and the callback called with |PP_OK|.
-   * If the user dismisses the menu without selecting an item,
-   * |PP_ERROR_USERCANCEL| will be indicated.
-   */
-  int32_t Show([in] PP_Resource menu_id,
-               [in] PP_Point location,
-               [out] int32_t selected_id,
-               [in] PP_CompletionCallback callback);
-};
-
diff --git a/chromium/ppapi/api/private/ppb_flash_message_loop.idl b/chromium/ppapi/api/private/ppb_flash_message_loop.idl
deleted file mode 100644
index 1b6a8341831..00000000000
--- a/chromium/ppapi/api/private/ppb_flash_message_loop.idl
+++ /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.
- */
-
-/**
- * This file contains the <code>PPB_Flash_MessageLoop</code> interface.
- */
-
-label Chrome {
-  M18 = 0.1
-};
-
-/**
- * The <code>PPB_Flash_MessageLoop</code> interface supports Pepper Flash to run
- * nested run loops.
- */
-interface PPB_Flash_MessageLoop {
-  /**
-   * Allocates a Flash message loop resource.
-   *
-   * @param[in] instance A <code>PP_Instance</code> identifying one instance
-   * of a module.
-   *
-   * @return A <code>PP_Resource</code> that can be used to run a nested message
-   * loop if successful; 0 if failed.
-   */
-  PP_Resource Create([in] PP_Instance instance);
-
-  /**
-   * Determines if a given resource is a Flash message loop.
-   *
-   * @param[in] resource A <code>PP_Resource</code> corresponding to a generic
-   * resource.
-   *
-   * @return A <code>PP_Bool</code> that is <code>PP_TRUE</code> if the given
-   * resource is a Flash message loop, otherwise <code>PP_FALSE</code>.
-   */
-  PP_Bool IsFlashMessageLoop([in] PP_Resource resource);
-
-  /**
-   * Runs a nested run loop. The plugin will be reentered from this call.
-   * This function is used in places where Flash would normally enter a nested
-   * message loop (e.g., when displaying context menus), but Pepper provides
-   * only an asynchronous call. After performing that asynchronous call, call
-   * <code>Run()</code>. In the callback, call <code>Quit()</code>.
-   *
-   * For a given message loop resource, only the first call to
-   * <code>Run()</code> will start a nested run loop. The subsequent calls
-   * will return <code>PP_ERROR_FAILED</code> immediately.
-   *
-   * @param[in] flash_message_loop The Flash message loop.
-   *
-   * @return <code>PP_ERROR_ABORTED</code> if the message loop quits because the
-   * resource is destroyed; <code>PP_OK</code> if the message loop quits because
-   * of other reasons (e.g., <code>Quit()</code> is called);
-   * <code>PP_ERROR_FAILED</code> if this is not the first call to
-   * <code>Run()</code>.
-   */
-  int32_t Run([in] PP_Resource flash_message_loop);
-
-  /**
-   * Signals to quit the outermost nested run loop. Use this to exit and
-   * return back to the caller after you call <code>Run()</code>.
-   *
-   * If <code>Quit()</code> is not called to balance the call to
-   * <code>Run()</code>, the outermost nested run loop will be quitted
-   * implicitly when the resource is destroyed.
-   *
-   * @param[in] flash_message_loop The Flash message loop.
-   */
-  void Quit([in] PP_Resource flash_message_loop);
-};
diff --git a/chromium/ppapi/api/private/ppb_flash_print.idl b/chromium/ppapi/api/private/ppb_flash_print.idl
deleted file mode 100644
index 1961b8b8485..00000000000
--- a/chromium/ppapi/api/private/ppb_flash_print.idl
+++ /dev/null
@@ -1,23 +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_Flash_Print</code> interface.
- */
-
-label Chrome {
-  M20 = 1.0
-};
-
-/**
- * The <code>PPB_Flash_Print</code> interface contains Flash-specific printing
- * functionality.
- */
-interface PPB_Flash_Print {
-  /**
-   * Invokes printing on the given plugin instance.
-   */
-  void InvokePrinting([in] PP_Instance instance);
-};
diff --git a/chromium/ppapi/api/private/ppb_testing_private.idl b/chromium/ppapi/api/private/ppb_testing_private.idl
index d592c19d789..b3c94f5294a 100644
--- a/chromium/ppapi/api/private/ppb_testing_private.idl
+++ b/chromium/ppapi/api/private/ppb_testing_private.idl
@@ -79,20 +79,6 @@ interface PPB_Testing_Private {
   PP_Bool IsOutOfProcess();
 
   /**
-   * Posts the plugin's current Power Saver status to JavaScript. The plugin
-   * itself does not recieve anything. This is not idiomatic for Pepper,
-   * but convenient for testing.
-   */
-  void PostPowerSaverStatus([in] PP_Instance instance);
-
-  /**
-   * Subscribes to changes to the plugin's Power Saver status. The status
-   * changes are not forwarded to the plugin itself, but posted to JavaScript.
-   * This is not idiomatic for Pepper, but conveienent for testing.
-   */
-  void SubscribeToPowerSaverNotifications([in] PP_Instance instance);
-
-  /**
    * Passes the input event to the browser, which sends it back to the
    * plugin. The plugin should implement PPP_InputEvent and register for
    * the input event type.
diff --git a/chromium/ppapi/api/private/ppp_flash_browser_operations.idl b/chromium/ppapi/api/private/ppp_flash_browser_operations.idl
deleted file mode 100644
index eb1e9625fbe..00000000000
--- a/chromium/ppapi/api/private/ppp_flash_browser_operations.idl
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright 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>PPP_Flash_BrowserOperations</code> interface.
- */
-
-label Chrome {
-  M20 = 1.0,
-  M21 = 1.2,
-  M22 = 1.3
-};
-
-[assert_size(4)]
-enum PP_Flash_BrowserOperations_SettingType {
-  PP_FLASH_BROWSEROPERATIONS_SETTINGTYPE_CAMERAMIC = 0,
-  PP_FLASH_BROWSEROPERATIONS_SETTINGTYPE_PEERNETWORKING = 1,
-  PP_FLASH_BROWSEROPERATIONS_SETTINGTYPE_LAST = PP_FLASH_BROWSEROPERATIONS_SETTINGTYPE_PEERNETWORKING
-};
-
-[assert_size(4)]
-enum PP_Flash_BrowserOperations_Permission {
-  // This value is only used with <code>SetSitePermission()</code>.
-  PP_FLASH_BROWSEROPERATIONS_PERMISSION_DEFAULT = 0,
-  PP_FLASH_BROWSEROPERATIONS_PERMISSION_ALLOW = 1,
-  PP_FLASH_BROWSEROPERATIONS_PERMISSION_BLOCK = 2,
-  PP_FLASH_BROWSEROPERATIONS_PERMISSION_ASK = 3,
-  PP_FLASH_BROWSEROPERATIONS_PERMISSION_LAST = PP_FLASH_BROWSEROPERATIONS_PERMISSION_ASK
-};
-
-struct PP_Flash_BrowserOperations_SiteSetting {
-  cstr_t site;
-  PP_Flash_BrowserOperations_Permission permission;
-};
-
-typedef void PPB_Flash_BrowserOperations_GetSettingsCallback(
-    [inout] mem_t user_data,
-    [in] PP_Bool success,
-    [in] PP_Flash_BrowserOperations_Permission default_permission,
-    [in] uint32_t site_count,
-    [in, size_is(site_count)] PP_Flash_BrowserOperations_SiteSetting[] sites);
-
-/**
- * This interface allows the browser to request the plugin do things.
- */
-interface PPP_Flash_BrowserOperations {
-  /**
-   * This function allows the plugin to implement the "Clear site data" feature.
-   *
-   * @param[in] plugin_data_path String containing the directory where the
-   * plugin data is
-   * stored. On UTF16 systems (Windows), this will be encoded as UTF-8. It will
-   * be an absolute path and will not have a directory separator (slash) at the
-   * end.
-   * @param[in] site String specifying which site to clear the data for. This
-   * will be null to clear data for all sites.
-   * @param[in] flags Currently always 0 in Chrome to clear all data. This may
-   * be extended in the future to clear only specific types of data.
-   * @param[in] max_age The maximum age in seconds to clear data for. This
-   * allows the plugin to implement "clear past hour" and "clear past data",
-   * etc.
-   *
-   * @return PP_TRUE on success, PP_FALSE on failure.
-   *
-   * See also the NPP_ClearSiteData function in NPAPI.
-   * https://wiki.mozilla.org/NPAPI:ClearSiteData
-   */
-  PP_Bool ClearSiteData([in] str_t plugin_data_path,
-                        [in] str_t site,
-                        [in] uint64_t flags,
-                        [in] uint64_t max_age);
-
-  /**
-   * Requests the plugin to deauthorize content licenses. It prevents Flash from
-   * playing protected content, such as movies and music the user may have
-   * rented or purchased.
-   *
-   * @param[in] plugin_data_path String containing the directory where the
-   * plugin settings are stored.
-   *
-   * @return <code>PP_TRUE</code> on success, <code>PP_FALSE</code> on failure.
-   */
-  [version=1.2]
-  PP_Bool DeauthorizeContentLicenses([in] str_t plugin_data_path);
-
-  /**
-   * Gets permission settings. <code>callback</code> will be called exactly once
-   * to return the settings.
-   *
-   * @param[in] plugin_data_path String containing the directory where the
-   * plugin settings are stored.
-   * @param[in] setting_type What type of setting to retrieve.
-   * @param[in] callback The callback to return retrieved data.
-   * @param[inout] user_data An opaque pointer that will be passed to
-   * <code>callback</code>.
-   */
-  [version=1.2]
-  void GetPermissionSettings(
-      [in] str_t plugin_data_path,
-      [in] PP_Flash_BrowserOperations_SettingType setting_type,
-      [in] PPB_Flash_BrowserOperations_GetSettingsCallback callback,
-      [inout] mem_t user_data);
-
-  /**
-   * Sets default permission. It applies to all sites except those with
-   * site-specific settings.
-   *
-   * @param[in] plugin_data_path String containing the directory where the
-   * plugin settings are stored.
-   * @param[in] setting_type What type of setting to set.
-   * @param[in] permission The default permission.
-   * @param[in] clear_site_specific Whether to remove all site-specific
-   * settings.
-   *
-   * @return <code>PP_TRUE</code> on success, <code>PP_FALSE</code> on failure.
-   */
-  [version=1.2]
-  PP_Bool SetDefaultPermission(
-      [in] str_t plugin_data_path,
-      [in] PP_Flash_BrowserOperations_SettingType setting_type,
-      [in] PP_Flash_BrowserOperations_Permission permission,
-      [in] PP_Bool clear_site_specific);
-
-  /**
-   * Sets site-specific permission. If a site has already got site-specific
-   * permission and it is not in <code>sites</code>, it won't be affected.
-   *
-   * @param[in] plugin_data_path String containing the directory where the
-   * plugin settings are stored.
-   * @param[in] setting_type What type of setting to set.
-   * @param[in] site_count How many items are there in <code>sites</code>.
-   * @param[in] sites The site-specific settings. If a site is specified with
-   * <code>PP_FLASH_BROWSEROPERATIONS_PERMISSION_DEFAULT</code> permission, it
-   * will be removed from the site-specific list.
-   *
-   * @return <code>PP_TRUE</code> on success, <code>PP_FALSE</code> on failure.
-   */
-  [version=1.2]
-  PP_Bool SetSitePermission(
-      [in] str_t plugin_data_path,
-      [in] PP_Flash_BrowserOperations_SettingType setting_type,
-      [in] uint32_t site_count,
-      [in, size_is(site_count)] PP_Flash_BrowserOperations_SiteSetting[] sites);
-
-  /**
-   * Returns a list of sites that have stored data, for use with the
-   * "Clear site data" feature.
-   *
-   * @param[in] plugin_data_path String containing the directory where the
-   * plugin data is stored.
-   * @param[out] sites A NULL-terminated array of sites that have stored data.
-   * Use FreeSiteList on the array when done.
-   *
-   * See also the NPP_GetSitesWithData function in NPAPI:
-   * https://wiki.mozilla.org/NPAPI:ClearSiteData
-   */
-  [version=1.3]
-  void GetSitesWithData([in] str_t plugin_data_path,
-                        [out] str_t[] sites);
-
-  /**
-   * Frees the list of sites returned by GetSitesWithData.
-   *
-   * @param[in] sites A NULL-terminated array of strings.
-   */
-  [version=1.3]
-  void FreeSiteList([inout] str_t[] sites);
-};
diff --git a/chromium/ppapi/api/trusted/ppb_broker_trusted.idl b/chromium/ppapi/api/trusted/ppb_broker_trusted.idl
deleted file mode 100644
index 023d9fcff07..00000000000
--- a/chromium/ppapi/api/trusted/ppb_broker_trusted.idl
+++ /dev/null
@@ -1,77 +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 defines the PPB_BrokerTrusted interface, which provides
- * access to a trusted broker with greater privileges than the plugin.
- */
-
-label Chrome {
-  M14 = 0.2,
-  M25 = 0.3
-};
-
-/**
- * The PPB_BrokerTrusted interface provides access to a trusted broker
- * with greater privileges than the plugin. The interface only supports
- * out-of-process plugins and is to be used by proxy implementations.  All
- * functions should be called from the main thread only.
- *
- * A PPB_BrokerTrusted resource represents a connection to the broker. Its
- * lifetime controls the lifetime of the broker, regardless of whether the
- * handle is closed. The handle should be closed before the resource is
- * released.
- */
-[macro="PPB_BROKER_TRUSTED_INTERFACE"]
-interface PPB_BrokerTrusted {
-  /**
-   * Returns a trusted broker resource.
-   */
-  PP_Resource CreateTrusted([in] PP_Instance instance);
-
-  /**
-   * Returns true if the resource is a trusted broker.
-   */
-  PP_Bool IsBrokerTrusted([in] PP_Resource resource);
-
-  /**
-   * Connects to the trusted broker. It may have already
-   * been launched by another instance.
-   * The plugin takes ownership of the handle once the callback has been called
-   * with a result of PP_OK. The plugin should immediately call GetHandle and
-   * begin managing it. If the result is not PP_OK, the browser still owns the
-   * handle.
-   *
-   * Returns PP_ERROR_WOULD_BLOCK on success, and invokes
-   * the |connect_callback| asynchronously to complete.
-   * As this function should always be invoked from the main thread,
-   * do not use the blocking variant of PP_CompletionCallback.
-   * Returns PP_ERROR_FAILED if called from an in-process plugin.
-   */
-  int32_t Connect([in] PP_Resource broker,
-                  [in] PP_CompletionCallback connect_callback);
-
-  /**
-   * Gets the handle to the pipe. Use once Connect has completed. Each instance
-   * of this interface has its own pipe.
-   *
-   * Returns PP_OK on success, and places the result into the given output
-   * parameter. The handle is only set when returning PP_OK. Calling this
-   * before connect has completed will return PP_ERROR_FAILED.
-   */
-  int32_t GetHandle([in] PP_Resource broker, [out] int32_t handle);
-
-  /**
-   * Returns PP_TRUE if the plugin has permission to launch the broker. A user
-   * must explicitly grant permission to launch the broker for a particular
-   * website. This is done through an infobar that is displayed when |Connect|
-   * is called. This function returns PP_TRUE if the user has already granted
-   * permission to launch the broker for the website containing this plugin
-   * instance. Returns PP_FALSE otherwise.
-   */
-  [version=0.3]
-  PP_Bool IsAllowed([in] PP_Resource broker);
-};
-
diff --git a/chromium/ppapi/api/trusted/ppp_broker.idl b/chromium/ppapi/api/trusted/ppp_broker.idl
deleted file mode 100644
index a9dc4fabad3..00000000000
--- a/chromium/ppapi/api/trusted/ppp_broker.idl
+++ /dev/null
@@ -1,94 +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 defines functions that your module must implement to support a
- * broker.
- */
-
-#inline c
-// {PENDING: undefine PP_EXPORT?}
-
-#include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_stdint.h"
-
-
-#if __GNUC__ >= 4
-
-#define PP_EXPORT __attribute__ ((visibility("default")))
-#elif defined(_MSC_VER)
-#define PP_EXPORT __declspec(dllexport)
-#endif
-
-
-
-/* We don't want name mangling for these external functions.  We only need
- * 'extern "C"' if we're compiling with a C++ compiler.
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @addtogroup Typedefs
- * @{
- */
-
-/**
- * PP_ConnectInstance_Func defines the signature that you implement to
- * receive notifications when a plugin instance connects to the broker.
- * The broker should listen on the socket before returning.
- *
- * @param[in] instance The plugin instance connecting to the broker.
- * @param[in] handle Handle to a socket the broker can use to communicate with
- * the plugin.
- * @return PP_OK on success. Any other value on failure.
- */
-typedef int32_t (*PP_ConnectInstance_Func)(PP_Instance instance,
-                                           int32_t handle);
-/**
- * @}
- */
-
-/**
- * @addtogroup Functions
- * @{
- */
-
-/**
- * PPP_InitializeBroker() is the entry point for a broker and is
- * called by the browser when your module loads. Your code must implement this
- * function.
- *
- * Failure indicates to the browser that this broker can not be used. In this
- * case, the broker will be unloaded.
- *
- * @param[out] connect_instance_func A pointer to a connect instance function.
- * @return PP_OK on success. Any other value on failure.
-*/
-PP_EXPORT int32_t PPP_InitializeBroker(
-    PP_ConnectInstance_Func* connect_instance_func);
-/**
- * @}
- */
-
-/**
- * @addtogroup Functions
- * @{
- */
-
-/** PPP_ShutdownBroker() is called before the broker is unloaded.
- */
-PP_EXPORT void PPP_ShutdownBroker();
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#endinl
-