Deprecate and remove unused PPB_Flash functions.

There are a number of functions in PPB_Flash which have been unused for some time. These are:
RunMessageLoop/QuitMessageLoop - Deprecated in M18
GetSettingInt - Deprecated in M21
GetDeviceID - Deprecated in M21
InvokePrinting - Deprecated in M21

This change removes the implementations of those functions so that they do not have to be implemented in the new proxy. It also marks them as deprecated in PPB_Flash for version 13.0.

The change also removes PPB_Flash interfaces which are <12.4 because they are pre-M21.

BUG=


Review URL: https://chromiumcodereview.appspot.com/11411102

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

23 files changed, 282 insertions, 1001 deletions

diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
index 01c07ed..ee3b6b9 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -675,19 +675,13 @@ TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_ListObserver)
 
 TEST_PPAPI_IN_PROCESS(Flash_SetInstanceAlwaysOnTop)
 TEST_PPAPI_IN_PROCESS(Flash_GetProxyForURL)
-TEST_PPAPI_IN_PROCESS(Flash_MessageLoop)
 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset)
 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs)
-TEST_PPAPI_IN_PROCESS(Flash_GetDeviceID)
-TEST_PPAPI_IN_PROCESS(Flash_GetSettingInt)
 TEST_PPAPI_IN_PROCESS(Flash_GetSetting)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)
-TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs)
-TEST_PPAPI_OUT_OF_PROCESS(Flash_GetDeviceID)
-TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSettingInt)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting)
 // No in-process test for SetCrashData.
 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData)
diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.cc b/content/browser/renderer_host/pepper/pepper_message_filter.cc
index d9dc519..76362f0 100644
--- a/content/browser/renderer_host/pepper/pepper_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_message_filter.cc
@@ -59,15 +59,6 @@ namespace {
 const size_t kMaxSocketsAllowed = 1024;
 const uint32 kInvalidSocketID = 0;
 
-// The ID is a 256-bit hash digest hex-encoded.
-const int kDRMIdentifierSize = (256 / 8) * 2;
-// The path to the file containing the DRM ID.
-// It is mirrored from
-//   chrome/browser/chromeos/system/drm_settings.cc
-// TODO(brettw) remove this when we remove the sync Device ID getter in
-// preference for the async one.
-const char kDRMIdentifierFile[] = "Pepper DRM ID.0";
-
 void CreateNetAddressListFromAddressList(
     const net::AddressList& list,
     std::vector<PP_NetAddress_Private>* net_address_list) {
@@ -145,8 +136,6 @@ void PepperMessageFilter::OverrideThreadForMessage(
       message.type() == PpapiHostMsg_PPBUDPSocket_Bind::ID ||
       message.type() == PpapiHostMsg_PPBUDPSocket_SendTo::ID) {
     *thread = BrowserThread::UI;
-  } else if (message.type() == PepperMsg_GetDeviceID::ID) {
-    *thread = BrowserThread::FILE;
   }
 }
 
@@ -202,7 +191,6 @@ bool PepperMessageFilter::OnMessageReceived(const IPC::Message& msg,
 
     // Flash messages.
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_UpdateActivity, OnUpdateActivity)
-    IPC_MESSAGE_HANDLER(PepperMsg_GetDeviceID, OnGetDeviceID)
     IPC_MESSAGE_HANDLER(PepperMsg_GetLocalDataRestrictions,
                         OnGetLocalDataRestrictions)
 
@@ -738,42 +726,6 @@ void PepperMessageFilter::OnUpdateActivity() {
 #endif
 }
 
-// TODO(brettw) remove this when we remove the sync Device ID getter in
-// preference for the async one.
-void PepperMessageFilter::OnGetDeviceID(std::string* id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  id->clear();
-
-  // Grab the contents of the DRM identifier file.
-  FilePath drm_id_file = browser_path_;
-  drm_id_file = drm_id_file.AppendASCII(kDRMIdentifierFile);
-
-  // This method should not be called with high frequency and its
-  // useful to be able to validate use with a VLOG.
-  VLOG(1) << "DRM ID requested @ " << drm_id_file.value();
-
-  if (browser_path_.empty()) {
-    LOG(ERROR) << "GetDeviceID requested from outside the RENDERER context.";
-    return;
-  }
-
-  // Return an empty value when off the record.
-  if (incognito_)
-    return;
-
-  // TODO(wad,brettw) Add OffTheRecord() enforcement here.
-  // Normally this is left for the plugin to do, but in the
-  // future we should check here as an added safeguard.
-
-  char id_buf[kDRMIdentifierSize];
-  if (file_util::ReadFile(drm_id_file, id_buf, kDRMIdentifierSize) !=
-      kDRMIdentifierSize) {
-    VLOG(1) << "file not readable: " << drm_id_file.value();
-    return;
-  }
-  id->assign(id_buf, kDRMIdentifierSize);
-}
-
 void PepperMessageFilter::OnGetLocalDataRestrictions(
     const GURL& document_url,
     const GURL& plugin_url,
diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h
index f8608a0..6c5dafa 100644
--- a/content/browser/renderer_host/pepper/pepper_message_filter.h
+++ b/content/browser/renderer_host/pepper/pepper_message_filter.h
@@ -230,7 +230,6 @@ class PepperMessageFilter
                                  bool* succeeded,
                                  ppapi::PPB_X509Certificate_Fields* result);
   void OnUpdateActivity();
-  void OnGetDeviceID(std::string* id);
   void OnGetLocalDataRestrictions(const GURL& document_url,
                                   const GURL& plugin_url,
                                   PP_FlashLSORestrictions* restrictions);
diff --git a/content/common/pepper_messages.h b/content/common/pepper_messages.h
index 5d89a9b..84d1f8b 100644
--- a/content/common/pepper_messages.h
+++ b/content/common/pepper_messages.h
@@ -21,9 +21,6 @@ IPC_SYNC_MESSAGE_CONTROL1_1(PepperMsg_GetLocalTimeZoneOffset,
                             base::Time /* t */,
                             double /* result */)
 
-IPC_SYNC_MESSAGE_CONTROL0_1(PepperMsg_GetDeviceID,
-                            std::string /* id */)
-
 IPC_SYNC_MESSAGE_CONTROL2_1(PepperMsg_GetLocalDataRestrictions,
                             GURL /* document_url */,
                             GURL /* plugin_url */,
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
index 78e938e..0b7b1a5 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
@@ -1425,12 +1425,6 @@ double PepperPluginDelegateImpl::GetLocalTimeZoneOffset(base::Time t) {
   return result;
 }
 
-std::string PepperPluginDelegateImpl::GetDeviceID() {
-  std::string result;
-  render_view_->Send(new PepperMsg_GetDeviceID(&result));
-  return result;
-}
-
 PP_FlashLSORestrictions PepperPluginDelegateImpl::GetLocalDataRestrictions(
     const GURL& document_url,
     const GURL& plugin_url) {
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.h b/content/renderer/pepper/pepper_plugin_delegate_impl.h
index 3f60c32..cc69021 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.h
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.h
@@ -383,7 +383,6 @@ class PepperPluginDelegateImpl
       PP_DeviceType_Dev type,
       const EnumerateDevicesCallback& callback) OVERRIDE;
   virtual void StopEnumerateDevices(int request_id) OVERRIDE;
-  virtual std::string GetDeviceID() OVERRIDE;
   virtual PP_FlashLSORestrictions GetLocalDataRestrictions(
       const GURL& document_url,
       const GURL& plugin_url) OVERRIDE;
diff --git a/ppapi/api/private/ppb_flash.idl b/ppapi/api/private/ppb_flash.idl
index 024796d..c84268b 100644
--- a/ppapi/api/private/ppb_flash.idl
+++ b/ppapi/api/private/ppb_flash.idl
@@ -8,13 +8,10 @@
  */
 
 label Chrome {
-  M17 = 12.0,
-  M19 = 12.1,
-  M20_0 = 12.2,
-  M20_1 = 12.3,
   M21 = 12.4,
   M22 = 12.5,
-  M24 = 12.6
+  M24_0 = 12.6,
+  M24_1 = 13.0
 };
 
 [assert_size(4)]
@@ -154,18 +151,16 @@ interface PPB_Flash {
       [in] PP_Bool from_user_action);
 
   /**
-   * Runs a nested message 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
-   * |RunMessageLoop()|. In the callback, call |QuitMessageLoop()|.
+   * Deprecated. Does nothing. Use PPB_Flash_MessageLoop.
    */
+  [deprecate=13.0]
   void RunMessageLoop(
       [in] PP_Instance instance);
 
-  /* Posts a quit message for the outermost nested message loop. Use this to
-   * exit and return back to the caller after you call RunMessageLoop.
+  /**
+   * Deprecated. Does nothing. Use PPB_Flash_MessageLoop.
    */
+  [deprecate=13.0]
   void QuitMessageLoop(
       [in] PP_Instance instance);
 
@@ -199,15 +194,14 @@ interface PPB_Flash {
    * Returns whether the given rectangle (in the plugin) is topmost, i.e., above
    * all other web content.
    */
-  [version=12.1]
   PP_Bool IsRectTopmost(
       [in] PP_Instance instance,
       [in] PP_Rect rect);
 
   /**
-   * Does nothing, deprecated. See PPB_Flash_Print.
+   * Deprecated. Does nothing. Use PPB_Flash_Print.
    */
-  [version=12.1]
+  [deprecate=13.0]
   int32_t InvokePrinting(
       [in] PP_Instance instance);
 
@@ -215,21 +209,19 @@ interface PPB_Flash {
    * Indicates that there's activity and, e.g., the screensaver shouldn't kick
    * in.
    */
-  [version=12.1]
   void UpdateActivity(
       [in] PP_Instance instance);
 
   /**
-   * Returns the device ID as a string. Returns a PP_VARTYPE_UNDEFINED on error.
-   * Deprecated, use GetDeviceIDAsync.
+   * Deprecated. Does nothing.
    */
-  [version=12.2]
+  [deprecate=13.0]
   PP_Var GetDeviceID([in] PP_Instance instance);
 
   /**
-   * Deprecated. See GetSetting().
+   * Deprecated. Does nothing. See GetSetting().
    */
-  [version=12.3]
+  [deprecate=13.0]
   int32_t GetSettingInt([in] PP_Instance instance,
                         [in] PP_FlashSetting setting);
 
@@ -237,7 +229,6 @@ interface PPB_Flash {
    * Returns the value associated with the given setting. Invalid enums will
    * result in an undefined PP_Var return value.
    */
-  [version=12.4]
   PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting);
 
   /**
diff --git a/ppapi/c/private/ppb_flash.h b/ppapi/c/private/ppb_flash.h
index 0279556..36645cc 100644
--- a/ppapi/c/private/ppb_flash.h
+++ b/ppapi/c/private/ppb_flash.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From private/ppb_flash.idl modified Mon Oct  8 13:03:27 2012. */
+/* From private/ppb_flash.idl modified Tue Nov 20 10:12:16 2012. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_FLASH_H_
 #define PPAPI_C_PRIVATE_PPB_FLASH_H_
@@ -22,14 +22,11 @@
 #include "ppapi/c/pp_time.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_FLASH_INTERFACE_12_0 "PPB_Flash;12.0"
-#define PPB_FLASH_INTERFACE_12_1 "PPB_Flash;12.1"
-#define PPB_FLASH_INTERFACE_12_2 "PPB_Flash;12.2"
-#define PPB_FLASH_INTERFACE_12_3 "PPB_Flash;12.3"
 #define PPB_FLASH_INTERFACE_12_4 "PPB_Flash;12.4"
 #define PPB_FLASH_INTERFACE_12_5 "PPB_Flash;12.5"
 #define PPB_FLASH_INTERFACE_12_6 "PPB_Flash;12.6"
-#define PPB_FLASH_INTERFACE PPB_FLASH_INTERFACE_12_6
+#define PPB_FLASH_INTERFACE_13_0 "PPB_Flash;13.0"
+#define PPB_FLASH_INTERFACE PPB_FLASH_INTERFACE_13_0
 
 /**
  * @file
@@ -129,7 +126,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FlashCrashKey, 4);
  * The <code>PPB_Flash</code> interface contains pointers to various functions
  * that are only needed to support Pepper Flash.
  */
-struct PPB_Flash_12_6 {
+struct PPB_Flash_13_0 {
   /**
    * 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
@@ -168,18 +165,6 @@ struct PPB_Flash_12_6 {
                       const char* target,
                       PP_Bool from_user_action);
   /**
-   * Runs a nested message 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
-   * |RunMessageLoop()|. In the callback, call |QuitMessageLoop()|.
-   */
-  void (*RunMessageLoop)(PP_Instance instance);
-  /* Posts a quit message for the outermost nested message loop. Use this to
-   * exit and return back to the caller after you call RunMessageLoop.
-   */
-  void (*QuitMessageLoop)(PP_Instance instance);
-  /**
    * Retrieves the local time zone offset from GM time for the given UTC time.
    */
   double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t);
@@ -204,24 +189,11 @@ struct PPB_Flash_12_6 {
    */
   PP_Bool (*IsRectTopmost)(PP_Instance instance, const struct PP_Rect* rect);
   /**
-   * Does nothing, deprecated. See PPB_Flash_Print.
-   */
-  int32_t (*InvokePrinting)(PP_Instance instance);
-  /**
    * Indicates that there's activity and, e.g., the screensaver shouldn't kick
    * in.
    */
   void (*UpdateActivity)(PP_Instance instance);
   /**
-   * Returns the device ID as a string. Returns a PP_VARTYPE_UNDEFINED on error.
-   * Deprecated, use GetDeviceIDAsync.
-   */
-  struct PP_Var (*GetDeviceID)(PP_Instance instance);
-  /**
-   * Deprecated. See GetSetting().
-   */
-  int32_t (*GetSettingInt)(PP_Instance instance, PP_FlashSetting setting);
-  /**
    * Returns the value associated with the given setting. Invalid enums will
    * result in an undefined PP_Var return value.
    */
@@ -251,88 +223,9 @@ struct PPB_Flash_12_6 {
                                           struct PP_ArrayOutput devices);
 };
 
-typedef struct PPB_Flash_12_6 PPB_Flash;
-
-struct PPB_Flash_12_0 {
-  void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top);
-  PP_Bool (*DrawGlyphs)(PP_Instance instance,
-                        PP_Resource pp_image_data,
-                        const struct PP_FontDescription_Dev* font_desc,
-                        uint32_t color,
-                        const struct PP_Point* position,
-                        const struct PP_Rect* clip,
-                        const float transformation[3][3],
-                        PP_Bool allow_subpixel_aa,
-                        uint32_t glyph_count,
-                        const uint16_t glyph_indices[],
-                        const struct PP_Point glyph_advances[]);
-  struct PP_Var (*GetProxyForURL)(PP_Instance instance, const char* url);
-  int32_t (*Navigate)(PP_Resource request_info,
-                      const char* target,
-                      PP_Bool from_user_action);
-  void (*RunMessageLoop)(PP_Instance instance);
-  void (*QuitMessageLoop)(PP_Instance instance);
-  double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t);
-  struct PP_Var (*GetCommandLineArgs)(PP_Module module);
-  void (*PreloadFontWin)(const void* logfontw);
-};
+typedef struct PPB_Flash_13_0 PPB_Flash;
 
-struct PPB_Flash_12_1 {
-  void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top);
-  PP_Bool (*DrawGlyphs)(PP_Instance instance,
-                        PP_Resource pp_image_data,
-                        const struct PP_FontDescription_Dev* font_desc,
-                        uint32_t color,
-                        const struct PP_Point* position,
-                        const struct PP_Rect* clip,
-                        const float transformation[3][3],
-                        PP_Bool allow_subpixel_aa,
-                        uint32_t glyph_count,
-                        const uint16_t glyph_indices[],
-                        const struct PP_Point glyph_advances[]);
-  struct PP_Var (*GetProxyForURL)(PP_Instance instance, const char* url);
-  int32_t (*Navigate)(PP_Resource request_info,
-                      const char* target,
-                      PP_Bool from_user_action);
-  void (*RunMessageLoop)(PP_Instance instance);
-  void (*QuitMessageLoop)(PP_Instance instance);
-  double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t);
-  struct PP_Var (*GetCommandLineArgs)(PP_Module module);
-  void (*PreloadFontWin)(const void* logfontw);
-  PP_Bool (*IsRectTopmost)(PP_Instance instance, const struct PP_Rect* rect);
-  int32_t (*InvokePrinting)(PP_Instance instance);
-  void (*UpdateActivity)(PP_Instance instance);
-};
-
-struct PPB_Flash_12_2 {
-  void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top);
-  PP_Bool (*DrawGlyphs)(PP_Instance instance,
-                        PP_Resource pp_image_data,
-                        const struct PP_FontDescription_Dev* font_desc,
-                        uint32_t color,
-                        const struct PP_Point* position,
-                        const struct PP_Rect* clip,
-                        const float transformation[3][3],
-                        PP_Bool allow_subpixel_aa,
-                        uint32_t glyph_count,
-                        const uint16_t glyph_indices[],
-                        const struct PP_Point glyph_advances[]);
-  struct PP_Var (*GetProxyForURL)(PP_Instance instance, const char* url);
-  int32_t (*Navigate)(PP_Resource request_info,
-                      const char* target,
-                      PP_Bool from_user_action);
-  void (*RunMessageLoop)(PP_Instance instance);
-  void (*QuitMessageLoop)(PP_Instance instance);
-  double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t);
-  struct PP_Var (*GetCommandLineArgs)(PP_Module module);
-  void (*PreloadFontWin)(const void* logfontw);
-  PP_Bool (*IsRectTopmost)(PP_Instance instance, const struct PP_Rect* rect);
-  int32_t (*InvokePrinting)(PP_Instance instance);
-  void (*UpdateActivity)(PP_Instance instance);
-  struct PP_Var (*GetDeviceID)(PP_Instance instance);
-};
-
-struct PPB_Flash_12_3 {
+struct PPB_Flash_12_4 {
   void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top);
   PP_Bool (*DrawGlyphs)(PP_Instance instance,
                         PP_Resource pp_image_data,
@@ -359,9 +252,10 @@ struct PPB_Flash_12_3 {
   void (*UpdateActivity)(PP_Instance instance);
   struct PP_Var (*GetDeviceID)(PP_Instance instance);
   int32_t (*GetSettingInt)(PP_Instance instance, PP_FlashSetting setting);
+  struct PP_Var (*GetSetting)(PP_Instance instance, PP_FlashSetting setting);
 };
 
-struct PPB_Flash_12_4 {
+struct PPB_Flash_12_5 {
   void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top);
   PP_Bool (*DrawGlyphs)(PP_Instance instance,
                         PP_Resource pp_image_data,
@@ -389,9 +283,12 @@ struct PPB_Flash_12_4 {
   struct PP_Var (*GetDeviceID)(PP_Instance instance);
   int32_t (*GetSettingInt)(PP_Instance instance, PP_FlashSetting setting);
   struct PP_Var (*GetSetting)(PP_Instance instance, PP_FlashSetting setting);
+  PP_Bool (*SetCrashData)(PP_Instance instance,
+                          PP_FlashCrashKey key,
+                          struct PP_Var value);
 };
 
-struct PPB_Flash_12_5 {
+struct PPB_Flash_12_6 {
   void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top);
   PP_Bool (*DrawGlyphs)(PP_Instance instance,
                         PP_Resource pp_image_data,
@@ -422,6 +319,9 @@ struct PPB_Flash_12_5 {
   PP_Bool (*SetCrashData)(PP_Instance instance,
                           PP_FlashCrashKey key,
                           struct PP_Var value);
+  int32_t (*EnumerateVideoCaptureDevices)(PP_Instance instance,
+                                          PP_Resource video_capture,
+                                          struct PP_ArrayOutput devices);
 };
 /**
  * @}
diff --git a/ppapi/cpp/private/flash.cc b/ppapi/cpp/private/flash.cc
index 5707b70..bdf86f5 100644
--- a/ppapi/cpp/private/flash.cc
+++ b/ppapi/cpp/private/flash.cc
@@ -26,6 +26,10 @@ namespace pp {
 
 namespace {
 
+template <> const char* interface_name<PPB_Flash_13_0>() {
+  return PPB_FLASH_INTERFACE_13_0;
+}
+
 template <> const char* interface_name<PPB_Flash_12_6>() {
   return PPB_FLASH_INTERFACE_12_6;
 }
@@ -38,10 +42,6 @@ template <> const char* interface_name<PPB_Flash_12_4>() {
   return PPB_FLASH_INTERFACE_12_4;
 }
 
-template <> const char* interface_name<PPB_Flash_12_3>() {
-  return PPB_FLASH_INTERFACE_12_3;
-}
-
 template <> const char* interface_name<PPB_Flash_Print_1_0>() {
   return PPB_FLASH_PRINT_INTERFACE_1_0;
 }
@@ -51,7 +51,7 @@ template <> const char* interface_name<PPB_Flash_Print_1_0>() {
 // have this meta one at the most recent version. Function pointers will be
 // null if they're not supported on the current Chrome version.
 bool initialized_combined_interface = false;
-PPB_Flash flash_12_combined_interface;
+PPB_Flash_12_6 flash_12_combined_interface;
 
 // Makes sure that the most recent version is loaded into the combined
 // interface struct above. Any unsupported functions will be NULL. If there
@@ -68,9 +68,6 @@ void InitializeCombinedInterface() {
   } else if (has_interface<PPB_Flash_12_4>()) {
     memcpy(&flash_12_combined_interface, get_interface<PPB_Flash_12_4>(),
            sizeof(PPB_Flash_12_4));
-  } else if (has_interface<PPB_Flash_12_3>()) {
-    memcpy(&flash_12_combined_interface, get_interface<PPB_Flash_12_3>(),
-           sizeof(PPB_Flash_12_3));
   }
   initialized_combined_interface = true;
 }
@@ -81,17 +78,20 @@ namespace flash {
 
 // static
 bool Flash::IsAvailable() {
-  return has_interface<PPB_Flash_12_6>() ||
+  return has_interface<PPB_Flash_13_0>() ||
+         has_interface<PPB_Flash_12_6>() ||
          has_interface<PPB_Flash_12_5>() ||
-         has_interface<PPB_Flash_12_4>() ||
-         has_interface<PPB_Flash_12_3>();
+         has_interface<PPB_Flash_12_4>();
 }
 
 // static
 void Flash::SetInstanceAlwaysOnTop(const InstanceHandle& instance,
                                    bool on_top) {
   InitializeCombinedInterface();
-  if (flash_12_combined_interface.SetInstanceAlwaysOnTop) {
+  if (has_interface<PPB_Flash_13_0>()) {
+    get_interface<PPB_Flash_13_0>()->SetInstanceAlwaysOnTop(
+        instance.pp_instance(), PP_FromBool(on_top));
+  } else if (flash_12_combined_interface.SetInstanceAlwaysOnTop) {
     flash_12_combined_interface.SetInstanceAlwaysOnTop(
         instance.pp_instance(), PP_FromBool(on_top));
   }
@@ -110,6 +110,20 @@ bool Flash::DrawGlyphs(const InstanceHandle& instance,
                        const uint16_t glyph_indices[],
                        const PP_Point glyph_advances[]) {
   InitializeCombinedInterface();
+  if (has_interface<PPB_Flash_13_0>()) {
+    return PP_ToBool(get_interface<PPB_Flash_13_0>()->DrawGlyphs(
+        instance.pp_instance(),
+        image->pp_resource(),
+        &font_desc.pp_font_description(),
+        color,
+        &position.pp_point(),
+        &clip.pp_rect(),
+        transformation,
+        PP_FromBool(allow_subpixel_aa),
+        glyph_count,
+        glyph_indices,
+        glyph_advances));
+  }
   if (flash_12_combined_interface.DrawGlyphs) {
     return PP_ToBool(flash_12_combined_interface.DrawGlyphs(
         instance.pp_instance(),
@@ -131,6 +145,10 @@ bool Flash::DrawGlyphs(const InstanceHandle& instance,
 Var Flash::GetProxyForURL(const InstanceHandle& instance,
                           const std::string& url) {
   InitializeCombinedInterface();
+  if (has_interface<PPB_Flash_13_0>()) {
+    return Var(PASS_REF, get_interface<PPB_Flash_13_0>()->GetProxyForURL(
+        instance.pp_instance(), url.c_str()));
+  }
   if (flash_12_combined_interface.GetProxyForURL) {
     return Var(PASS_REF, flash_12_combined_interface.GetProxyForURL(
         instance.pp_instance(), url.c_str()));
@@ -143,6 +161,12 @@ int32_t Flash::Navigate(const URLRequestInfo& request_info,
                         const std::string& target,
                         bool from_user_action) {
   InitializeCombinedInterface();
+  if (has_interface<PPB_Flash_13_0>()) {
+    return get_interface<PPB_Flash_13_0>()->Navigate(
+        request_info.pp_resource(),
+        target.c_str(),
+        PP_FromBool(from_user_action));
+  }
   if (flash_12_combined_interface.Navigate) {
     return flash_12_combined_interface.Navigate(
         request_info.pp_resource(),
@@ -153,23 +177,13 @@ int32_t Flash::Navigate(const URLRequestInfo& request_info,
 }
 
 // static
-void Flash::RunMessageLoop(const InstanceHandle& instance) {
-  InitializeCombinedInterface();
-  if (flash_12_combined_interface.RunMessageLoop)
-    flash_12_combined_interface.RunMessageLoop(instance.pp_instance());
-}
-
-// static
-void Flash::QuitMessageLoop(const InstanceHandle& instance) {
-  InitializeCombinedInterface();
-  if (flash_12_combined_interface.QuitMessageLoop)
-    flash_12_combined_interface.QuitMessageLoop(instance.pp_instance());
-}
-
-// static
 double Flash::GetLocalTimeZoneOffset(const InstanceHandle& instance,
                                      PP_Time t) {
   InitializeCombinedInterface();
+  if (has_interface<PPB_Flash_13_0>()) {
+    return get_interface<PPB_Flash_13_0>()->GetLocalTimeZoneOffset(
+        instance.pp_instance(), t);
+  }
   if (flash_12_combined_interface.GetLocalTimeZoneOffset) {
     return flash_12_combined_interface.GetLocalTimeZoneOffset(
         instance.pp_instance(), t);
@@ -180,6 +194,10 @@ double Flash::GetLocalTimeZoneOffset(const InstanceHandle& instance,
 // static
 Var Flash::GetCommandLineArgs(Module* module) {
   InitializeCombinedInterface();
+  if (has_interface<PPB_Flash_13_0>()) {
+    return Var(PASS_REF, get_interface<PPB_Flash_13_0>()->GetCommandLineArgs(
+        module->pp_module()));
+  }
   if (flash_12_combined_interface.GetCommandLineArgs) {
     return Var(
         PASS_REF,
@@ -191,6 +209,8 @@ Var Flash::GetCommandLineArgs(Module* module) {
 // static
 void Flash::PreloadFontWin(const void* logfontw) {
   InitializeCombinedInterface();
+  if (has_interface<PPB_Flash_13_0>())
+    return get_interface<PPB_Flash_13_0>()->PreloadFontWin(logfontw);
   if (flash_12_combined_interface.PreloadFontWin)
     return flash_12_combined_interface.PreloadFontWin(logfontw);
 }
@@ -198,6 +218,10 @@ void Flash::PreloadFontWin(const void* logfontw) {
 // static
 bool Flash::IsRectTopmost(const InstanceHandle& instance, const Rect& rect) {
   InitializeCombinedInterface();
+  if (has_interface<PPB_Flash_13_0>()) {
+    return PP_ToBool(get_interface<PPB_Flash_13_0>()->IsRectTopmost(
+        instance.pp_instance(), &rect.pp_rect()));
+  }
   if (flash_12_combined_interface.IsRectTopmost) {
     return PP_ToBool(flash_12_combined_interface.IsRectTopmost(
         instance.pp_instance(), &rect.pp_rect()));
@@ -208,36 +232,24 @@ bool Flash::IsRectTopmost(const InstanceHandle& instance, const Rect& rect) {
 // static
 void Flash::UpdateActivity(const InstanceHandle& instance) {
   InitializeCombinedInterface();
-  if (flash_12_combined_interface.UpdateActivity)
+  if (has_interface<PPB_Flash_13_0>())
+    get_interface<PPB_Flash_13_0>()->UpdateActivity(instance.pp_instance());
+  else if (flash_12_combined_interface.UpdateActivity)
     flash_12_combined_interface.UpdateActivity(instance.pp_instance());
 }
 
 // static
-Var Flash::GetDeviceID(const InstanceHandle& instance) {
-  InitializeCombinedInterface();
-  if (flash_12_combined_interface.GetDeviceID) {
-    return Var(PASS_REF,
-               flash_12_combined_interface.GetDeviceID(instance.pp_instance()));
-  }
-  return Var();
-}
-
-// static
 Var Flash::GetSetting(const InstanceHandle& instance, PP_FlashSetting setting) {
   InitializeCombinedInterface();
+  if (has_interface<PPB_Flash_13_0>()) {
+    return Var(PASS_REF, get_interface<PPB_Flash_13_0>()->GetSetting(
+        instance.pp_instance(), setting));
+  }
   if (flash_12_combined_interface.GetSetting) {
     return Var(PASS_REF,
                flash_12_combined_interface.GetSetting(instance.pp_instance(),
                                                       setting));
   }
-  if (flash_12_combined_interface.GetSettingInt) {
-    // All the |PP_FlashSetting|s supported by |GetSettingInt()| return
-    // "booleans" (0 for false, 1 for true, -1 for undefined/unsupported/error).
-    int32_t result = flash_12_combined_interface.GetSettingInt(
-        instance.pp_instance(), setting);
-    if (result == 0 || result == 1)
-      return Var(!!result);
-  }
 
   return Var();
 }
@@ -247,6 +259,10 @@ bool Flash::SetCrashData(const InstanceHandle& instance,
                          PP_FlashCrashKey key,
                          const pp::Var& value) {
   InitializeCombinedInterface();
+  if (has_interface<PPB_Flash_13_0>()) {
+    return PP_ToBool(get_interface<PPB_Flash_13_0>()->SetCrashData(
+        instance.pp_instance(), key, value.pp_var()));
+  }
   if (flash_12_combined_interface.SetCrashData) {
     return PP_ToBool(
         flash_12_combined_interface.SetCrashData(instance.pp_instance(),
@@ -261,6 +277,13 @@ int32_t Flash::EnumerateVideoCaptureDevices(
     const VideoCapture_Dev& video_capture,
     std::vector<DeviceRef_Dev>* devices_out) {
   InitializeCombinedInterface();
+  if (has_interface<PPB_Flash_13_0>()) {
+    ResourceArrayOutputAdapter<DeviceRef_Dev> adapter(devices_out);
+    return get_interface<PPB_Flash_13_0>()->EnumerateVideoCaptureDevices(
+        instance.pp_instance(),
+        video_capture.pp_resource(),
+        adapter.pp_array_output());
+  }
   if (flash_12_combined_interface.EnumerateVideoCaptureDevices) {
     ResourceArrayOutputAdapter<DeviceRef_Dev> adapter(devices_out);
     return flash_12_combined_interface.EnumerateVideoCaptureDevices(
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 4bfd360f..750fa32 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
@@ -208,13 +208,10 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_Widget_Dev_0_2;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_Zoom_Dev_0_3;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_ContentDecryptor_Private_0_6;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileRefPrivate_0_1;
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_0;
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_1;
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_2;
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_3;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_4;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_5;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_6;
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_13_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0;
@@ -2084,310 +2081,6 @@ struct PP_Var Pnacl_M15_PPB_FileRefPrivate_GetAbsolutePath(PP_Resource file_ref)
 
 /* End wrapper methods for PPB_FileRefPrivate_0_1 */
 
-/* Begin wrapper methods for PPB_Flash_12_0 */
-
-static __attribute__((pnaclcall))
-void Pnacl_M17_PPB_Flash_SetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool on_top) {
-  const struct PPB_Flash_12_0 *iface = Pnacl_WrapperInfo_PPB_Flash_12_0.real_iface;
-  iface->SetInstanceAlwaysOnTop(instance, on_top);
-}
-
-static __attribute__((pnaclcall))
-PP_Bool Pnacl_M17_PPB_Flash_DrawGlyphs(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]) {
-  const struct PPB_Flash_12_0 *iface = Pnacl_WrapperInfo_PPB_Flash_12_0.real_iface;
-  return iface->DrawGlyphs(instance, pp_image_data, font_desc, color, position, clip, transformation, allow_subpixel_aa, glyph_count, glyph_indices, glyph_advances);
-}
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M17_PPB_Flash_GetProxyForURL(PP_Instance instance, const char* url) {
-  const struct PPB_Flash_12_0 *iface = Pnacl_WrapperInfo_PPB_Flash_12_0.real_iface;
-  return iface->GetProxyForURL(instance, url);
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M17_PPB_Flash_Navigate(PP_Resource request_info, const char* target, PP_Bool from_user_action) {
-  const struct PPB_Flash_12_0 *iface = Pnacl_WrapperInfo_PPB_Flash_12_0.real_iface;
-  return iface->Navigate(request_info, target, from_user_action);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M17_PPB_Flash_RunMessageLoop(PP_Instance instance) {
-  const struct PPB_Flash_12_0 *iface = Pnacl_WrapperInfo_PPB_Flash_12_0.real_iface;
-  iface->RunMessageLoop(instance);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M17_PPB_Flash_QuitMessageLoop(PP_Instance instance) {
-  const struct PPB_Flash_12_0 *iface = Pnacl_WrapperInfo_PPB_Flash_12_0.real_iface;
-  iface->QuitMessageLoop(instance);
-}
-
-static __attribute__((pnaclcall))
-double Pnacl_M17_PPB_Flash_GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) {
-  const struct PPB_Flash_12_0 *iface = Pnacl_WrapperInfo_PPB_Flash_12_0.real_iface;
-  return iface->GetLocalTimeZoneOffset(instance, t);
-}
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M17_PPB_Flash_GetCommandLineArgs(PP_Module module) {
-  const struct PPB_Flash_12_0 *iface = Pnacl_WrapperInfo_PPB_Flash_12_0.real_iface;
-  return iface->GetCommandLineArgs(module);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M17_PPB_Flash_PreloadFontWin(const void* logfontw) {
-  const struct PPB_Flash_12_0 *iface = Pnacl_WrapperInfo_PPB_Flash_12_0.real_iface;
-  iface->PreloadFontWin(logfontw);
-}
-
-/* End wrapper methods for PPB_Flash_12_0 */
-
-/* Begin wrapper methods for PPB_Flash_12_1 */
-
-static __attribute__((pnaclcall))
-void Pnacl_M19_PPB_Flash_SetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool on_top) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  iface->SetInstanceAlwaysOnTop(instance, on_top);
-}
-
-static __attribute__((pnaclcall))
-PP_Bool Pnacl_M19_PPB_Flash_DrawGlyphs(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  return iface->DrawGlyphs(instance, pp_image_data, font_desc, color, position, clip, transformation, allow_subpixel_aa, glyph_count, glyph_indices, glyph_advances);
-}
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M19_PPB_Flash_GetProxyForURL(PP_Instance instance, const char* url) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  return iface->GetProxyForURL(instance, url);
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M19_PPB_Flash_Navigate(PP_Resource request_info, const char* target, PP_Bool from_user_action) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  return iface->Navigate(request_info, target, from_user_action);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M19_PPB_Flash_RunMessageLoop(PP_Instance instance) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  iface->RunMessageLoop(instance);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M19_PPB_Flash_QuitMessageLoop(PP_Instance instance) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  iface->QuitMessageLoop(instance);
-}
-
-static __attribute__((pnaclcall))
-double Pnacl_M19_PPB_Flash_GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  return iface->GetLocalTimeZoneOffset(instance, t);
-}
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M19_PPB_Flash_GetCommandLineArgs(PP_Module module) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  return iface->GetCommandLineArgs(module);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M19_PPB_Flash_PreloadFontWin(const void* logfontw) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  iface->PreloadFontWin(logfontw);
-}
-
-static __attribute__((pnaclcall))
-PP_Bool Pnacl_M19_PPB_Flash_IsRectTopmost(PP_Instance instance, const struct PP_Rect* rect) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  return iface->IsRectTopmost(instance, rect);
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M19_PPB_Flash_InvokePrinting(PP_Instance instance) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  return iface->InvokePrinting(instance);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M19_PPB_Flash_UpdateActivity(PP_Instance instance) {
-  const struct PPB_Flash_12_1 *iface = Pnacl_WrapperInfo_PPB_Flash_12_1.real_iface;
-  iface->UpdateActivity(instance);
-}
-
-/* End wrapper methods for PPB_Flash_12_1 */
-
-/* Begin wrapper methods for PPB_Flash_12_2 */
-
-static __attribute__((pnaclcall))
-void Pnacl_M20_0_PPB_Flash_SetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool on_top) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  iface->SetInstanceAlwaysOnTop(instance, on_top);
-}
-
-static __attribute__((pnaclcall))
-PP_Bool Pnacl_M20_0_PPB_Flash_DrawGlyphs(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  return iface->DrawGlyphs(instance, pp_image_data, font_desc, color, position, clip, transformation, allow_subpixel_aa, glyph_count, glyph_indices, glyph_advances);
-}
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M20_0_PPB_Flash_GetProxyForURL(PP_Instance instance, const char* url) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  return iface->GetProxyForURL(instance, url);
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M20_0_PPB_Flash_Navigate(PP_Resource request_info, const char* target, PP_Bool from_user_action) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  return iface->Navigate(request_info, target, from_user_action);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M20_0_PPB_Flash_RunMessageLoop(PP_Instance instance) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  iface->RunMessageLoop(instance);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M20_0_PPB_Flash_QuitMessageLoop(PP_Instance instance) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  iface->QuitMessageLoop(instance);
-}
-
-static __attribute__((pnaclcall))
-double Pnacl_M20_0_PPB_Flash_GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  return iface->GetLocalTimeZoneOffset(instance, t);
-}
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M20_0_PPB_Flash_GetCommandLineArgs(PP_Module module) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  return iface->GetCommandLineArgs(module);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M20_0_PPB_Flash_PreloadFontWin(const void* logfontw) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  iface->PreloadFontWin(logfontw);
-}
-
-static __attribute__((pnaclcall))
-PP_Bool Pnacl_M20_0_PPB_Flash_IsRectTopmost(PP_Instance instance, const struct PP_Rect* rect) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  return iface->IsRectTopmost(instance, rect);
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M20_0_PPB_Flash_InvokePrinting(PP_Instance instance) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  return iface->InvokePrinting(instance);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M20_0_PPB_Flash_UpdateActivity(PP_Instance instance) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  iface->UpdateActivity(instance);
-}
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M20_0_PPB_Flash_GetDeviceID(PP_Instance instance) {
-  const struct PPB_Flash_12_2 *iface = Pnacl_WrapperInfo_PPB_Flash_12_2.real_iface;
-  return iface->GetDeviceID(instance);
-}
-
-/* End wrapper methods for PPB_Flash_12_2 */
-
-/* Begin wrapper methods for PPB_Flash_12_3 */
-
-static __attribute__((pnaclcall))
-void Pnacl_M20_1_PPB_Flash_SetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool on_top) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  iface->SetInstanceAlwaysOnTop(instance, on_top);
-}
-
-static __attribute__((pnaclcall))
-PP_Bool Pnacl_M20_1_PPB_Flash_DrawGlyphs(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  return iface->DrawGlyphs(instance, pp_image_data, font_desc, color, position, clip, transformation, allow_subpixel_aa, glyph_count, glyph_indices, glyph_advances);
-}
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M20_1_PPB_Flash_GetProxyForURL(PP_Instance instance, const char* url) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  return iface->GetProxyForURL(instance, url);
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M20_1_PPB_Flash_Navigate(PP_Resource request_info, const char* target, PP_Bool from_user_action) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  return iface->Navigate(request_info, target, from_user_action);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M20_1_PPB_Flash_RunMessageLoop(PP_Instance instance) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  iface->RunMessageLoop(instance);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M20_1_PPB_Flash_QuitMessageLoop(PP_Instance instance) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  iface->QuitMessageLoop(instance);
-}
-
-static __attribute__((pnaclcall))
-double Pnacl_M20_1_PPB_Flash_GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  return iface->GetLocalTimeZoneOffset(instance, t);
-}
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M20_1_PPB_Flash_GetCommandLineArgs(PP_Module module) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  return iface->GetCommandLineArgs(module);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M20_1_PPB_Flash_PreloadFontWin(const void* logfontw) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  iface->PreloadFontWin(logfontw);
-}
-
-static __attribute__((pnaclcall))
-PP_Bool Pnacl_M20_1_PPB_Flash_IsRectTopmost(PP_Instance instance, const struct PP_Rect* rect) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  return iface->IsRectTopmost(instance, rect);
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M20_1_PPB_Flash_InvokePrinting(PP_Instance instance) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  return iface->InvokePrinting(instance);
-}
-
-static __attribute__((pnaclcall))
-void Pnacl_M20_1_PPB_Flash_UpdateActivity(PP_Instance instance) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  iface->UpdateActivity(instance);
-}
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M20_1_PPB_Flash_GetDeviceID(PP_Instance instance) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  return iface->GetDeviceID(instance);
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M20_1_PPB_Flash_GetSettingInt(PP_Instance instance, PP_FlashSetting setting) {
-  const struct PPB_Flash_12_3 *iface = Pnacl_WrapperInfo_PPB_Flash_12_3.real_iface;
-  return iface->GetSettingInt(instance, setting);
-}
-
-/* End wrapper methods for PPB_Flash_12_3 */
-
 /* Begin wrapper methods for PPB_Flash_12_4 */
 
 static __attribute__((pnaclcall))
@@ -2585,109 +2278,185 @@ PP_Bool Pnacl_M22_PPB_Flash_SetCrashData(PP_Instance instance, PP_FlashCrashKey
 /* Begin wrapper methods for PPB_Flash_12_6 */
 
 static __attribute__((pnaclcall))
-void Pnacl_M24_PPB_Flash_SetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool on_top) {
+void Pnacl_M24_0_PPB_Flash_SetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool on_top) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   iface->SetInstanceAlwaysOnTop(instance, on_top);
 }
 
 static __attribute__((pnaclcall))
-PP_Bool Pnacl_M24_PPB_Flash_DrawGlyphs(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]) {
+PP_Bool Pnacl_M24_0_PPB_Flash_DrawGlyphs(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->DrawGlyphs(instance, pp_image_data, font_desc, color, position, clip, transformation, allow_subpixel_aa, glyph_count, glyph_indices, glyph_advances);
 }
 
 static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M24_PPB_Flash_GetProxyForURL(PP_Instance instance, const char* url) {
+struct PP_Var Pnacl_M24_0_PPB_Flash_GetProxyForURL(PP_Instance instance, const char* url) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->GetProxyForURL(instance, url);
 }
 
 static __attribute__((pnaclcall))
-int32_t Pnacl_M24_PPB_Flash_Navigate(PP_Resource request_info, const char* target, PP_Bool from_user_action) {
+int32_t Pnacl_M24_0_PPB_Flash_Navigate(PP_Resource request_info, const char* target, PP_Bool from_user_action) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->Navigate(request_info, target, from_user_action);
 }
 
 static __attribute__((pnaclcall))
-void Pnacl_M24_PPB_Flash_RunMessageLoop(PP_Instance instance) {
+void Pnacl_M24_0_PPB_Flash_RunMessageLoop(PP_Instance instance) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   iface->RunMessageLoop(instance);
 }
 
 static __attribute__((pnaclcall))
-void Pnacl_M24_PPB_Flash_QuitMessageLoop(PP_Instance instance) {
+void Pnacl_M24_0_PPB_Flash_QuitMessageLoop(PP_Instance instance) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   iface->QuitMessageLoop(instance);
 }
 
 static __attribute__((pnaclcall))
-double Pnacl_M24_PPB_Flash_GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) {
+double Pnacl_M24_0_PPB_Flash_GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->GetLocalTimeZoneOffset(instance, t);
 }
 
 static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M24_PPB_Flash_GetCommandLineArgs(PP_Module module) {
+struct PP_Var Pnacl_M24_0_PPB_Flash_GetCommandLineArgs(PP_Module module) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->GetCommandLineArgs(module);
 }
 
 static __attribute__((pnaclcall))
-void Pnacl_M24_PPB_Flash_PreloadFontWin(const void* logfontw) {
+void Pnacl_M24_0_PPB_Flash_PreloadFontWin(const void* logfontw) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   iface->PreloadFontWin(logfontw);
 }
 
 static __attribute__((pnaclcall))
-PP_Bool Pnacl_M24_PPB_Flash_IsRectTopmost(PP_Instance instance, const struct PP_Rect* rect) {
+PP_Bool Pnacl_M24_0_PPB_Flash_IsRectTopmost(PP_Instance instance, const struct PP_Rect* rect) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->IsRectTopmost(instance, rect);
 }
 
 static __attribute__((pnaclcall))
-int32_t Pnacl_M24_PPB_Flash_InvokePrinting(PP_Instance instance) {
+int32_t Pnacl_M24_0_PPB_Flash_InvokePrinting(PP_Instance instance) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->InvokePrinting(instance);
 }
 
 static __attribute__((pnaclcall))
-void Pnacl_M24_PPB_Flash_UpdateActivity(PP_Instance instance) {
+void Pnacl_M24_0_PPB_Flash_UpdateActivity(PP_Instance instance) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   iface->UpdateActivity(instance);
 }
 
 static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M24_PPB_Flash_GetDeviceID(PP_Instance instance) {
+struct PP_Var Pnacl_M24_0_PPB_Flash_GetDeviceID(PP_Instance instance) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->GetDeviceID(instance);
 }
 
 static __attribute__((pnaclcall))
-int32_t Pnacl_M24_PPB_Flash_GetSettingInt(PP_Instance instance, PP_FlashSetting setting) {
+int32_t Pnacl_M24_0_PPB_Flash_GetSettingInt(PP_Instance instance, PP_FlashSetting setting) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->GetSettingInt(instance, setting);
 }
 
 static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M24_PPB_Flash_GetSetting(PP_Instance instance, PP_FlashSetting setting) {
+struct PP_Var Pnacl_M24_0_PPB_Flash_GetSetting(PP_Instance instance, PP_FlashSetting setting) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->GetSetting(instance, setting);
 }
 
 static __attribute__((pnaclcall))
-PP_Bool Pnacl_M24_PPB_Flash_SetCrashData(PP_Instance instance, PP_FlashCrashKey key, struct PP_Var value) {
+PP_Bool Pnacl_M24_0_PPB_Flash_SetCrashData(PP_Instance instance, PP_FlashCrashKey key, struct PP_Var value) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->SetCrashData(instance, key, value);
 }
 
 static __attribute__((pnaclcall))
-int32_t Pnacl_M24_PPB_Flash_EnumerateVideoCaptureDevices(PP_Instance instance, PP_Resource video_capture, struct PP_ArrayOutput devices) {
+int32_t Pnacl_M24_0_PPB_Flash_EnumerateVideoCaptureDevices(PP_Instance instance, PP_Resource video_capture, struct PP_ArrayOutput devices) {
   const struct PPB_Flash_12_6 *iface = Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
   return iface->EnumerateVideoCaptureDevices(instance, video_capture, devices);
 }
 
 /* End wrapper methods for PPB_Flash_12_6 */
 
+/* Begin wrapper methods for PPB_Flash_13_0 */
+
+static __attribute__((pnaclcall))
+void Pnacl_M24_1_PPB_Flash_SetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool on_top) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  iface->SetInstanceAlwaysOnTop(instance, on_top);
+}
+
+static __attribute__((pnaclcall))
+PP_Bool Pnacl_M24_1_PPB_Flash_DrawGlyphs(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  return iface->DrawGlyphs(instance, pp_image_data, font_desc, color, position, clip, transformation, allow_subpixel_aa, glyph_count, glyph_indices, glyph_advances);
+}
+
+static __attribute__((pnaclcall))
+struct PP_Var Pnacl_M24_1_PPB_Flash_GetProxyForURL(PP_Instance instance, const char* url) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  return iface->GetProxyForURL(instance, url);
+}
+
+static __attribute__((pnaclcall))
+int32_t Pnacl_M24_1_PPB_Flash_Navigate(PP_Resource request_info, const char* target, PP_Bool from_user_action) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  return iface->Navigate(request_info, target, from_user_action);
+}
+
+static __attribute__((pnaclcall))
+double Pnacl_M24_1_PPB_Flash_GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  return iface->GetLocalTimeZoneOffset(instance, t);
+}
+
+static __attribute__((pnaclcall))
+struct PP_Var Pnacl_M24_1_PPB_Flash_GetCommandLineArgs(PP_Module module) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  return iface->GetCommandLineArgs(module);
+}
+
+static __attribute__((pnaclcall))
+void Pnacl_M24_1_PPB_Flash_PreloadFontWin(const void* logfontw) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  iface->PreloadFontWin(logfontw);
+}
+
+static __attribute__((pnaclcall))
+PP_Bool Pnacl_M24_1_PPB_Flash_IsRectTopmost(PP_Instance instance, const struct PP_Rect* rect) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  return iface->IsRectTopmost(instance, rect);
+}
+
+static __attribute__((pnaclcall))
+void Pnacl_M24_1_PPB_Flash_UpdateActivity(PP_Instance instance) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  iface->UpdateActivity(instance);
+}
+
+static __attribute__((pnaclcall))
+struct PP_Var Pnacl_M24_1_PPB_Flash_GetSetting(PP_Instance instance, PP_FlashSetting setting) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  return iface->GetSetting(instance, setting);
+}
+
+static __attribute__((pnaclcall))
+PP_Bool Pnacl_M24_1_PPB_Flash_SetCrashData(PP_Instance instance, PP_FlashCrashKey key, struct PP_Var value) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  return iface->SetCrashData(instance, key, value);
+}
+
+static __attribute__((pnaclcall))
+int32_t Pnacl_M24_1_PPB_Flash_EnumerateVideoCaptureDevices(PP_Instance instance, PP_Resource video_capture, struct PP_ArrayOutput devices) {
+  const struct PPB_Flash_13_0 *iface = Pnacl_WrapperInfo_PPB_Flash_13_0.real_iface;
+  return iface->EnumerateVideoCaptureDevices(instance, video_capture, devices);
+}
+
+/* End wrapper methods for PPB_Flash_13_0 */
+
 /* Begin wrapper methods for PPB_Flash_Clipboard_4_0 */
 
 static __attribute__((pnaclcall))
@@ -4003,66 +3772,6 @@ struct PPB_FileRefPrivate_0_1 Pnacl_Wrappers_PPB_FileRefPrivate_0_1 = {
     .GetAbsolutePath = (struct PP_Var (*)(PP_Resource file_ref))&Pnacl_M15_PPB_FileRefPrivate_GetAbsolutePath
 };
 
-struct PPB_Flash_12_0 Pnacl_Wrappers_PPB_Flash_12_0 = {
-    .SetInstanceAlwaysOnTop = (void (*)(PP_Instance instance, PP_Bool on_top))&Pnacl_M17_PPB_Flash_SetInstanceAlwaysOnTop,
-    .DrawGlyphs = (PP_Bool (*)(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]))&Pnacl_M17_PPB_Flash_DrawGlyphs,
-    .GetProxyForURL = (struct PP_Var (*)(PP_Instance instance, const char* url))&Pnacl_M17_PPB_Flash_GetProxyForURL,
-    .Navigate = (int32_t (*)(PP_Resource request_info, const char* target, PP_Bool from_user_action))&Pnacl_M17_PPB_Flash_Navigate,
-    .RunMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M17_PPB_Flash_RunMessageLoop,
-    .QuitMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M17_PPB_Flash_QuitMessageLoop,
-    .GetLocalTimeZoneOffset = (double (*)(PP_Instance instance, PP_Time t))&Pnacl_M17_PPB_Flash_GetLocalTimeZoneOffset,
-    .GetCommandLineArgs = (struct PP_Var (*)(PP_Module module))&Pnacl_M17_PPB_Flash_GetCommandLineArgs,
-    .PreloadFontWin = (void (*)(const void* logfontw))&Pnacl_M17_PPB_Flash_PreloadFontWin
-};
-
-struct PPB_Flash_12_1 Pnacl_Wrappers_PPB_Flash_12_1 = {
-    .SetInstanceAlwaysOnTop = (void (*)(PP_Instance instance, PP_Bool on_top))&Pnacl_M19_PPB_Flash_SetInstanceAlwaysOnTop,
-    .DrawGlyphs = (PP_Bool (*)(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]))&Pnacl_M19_PPB_Flash_DrawGlyphs,
-    .GetProxyForURL = (struct PP_Var (*)(PP_Instance instance, const char* url))&Pnacl_M19_PPB_Flash_GetProxyForURL,
-    .Navigate = (int32_t (*)(PP_Resource request_info, const char* target, PP_Bool from_user_action))&Pnacl_M19_PPB_Flash_Navigate,
-    .RunMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M19_PPB_Flash_RunMessageLoop,
-    .QuitMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M19_PPB_Flash_QuitMessageLoop,
-    .GetLocalTimeZoneOffset = (double (*)(PP_Instance instance, PP_Time t))&Pnacl_M19_PPB_Flash_GetLocalTimeZoneOffset,
-    .GetCommandLineArgs = (struct PP_Var (*)(PP_Module module))&Pnacl_M19_PPB_Flash_GetCommandLineArgs,
-    .PreloadFontWin = (void (*)(const void* logfontw))&Pnacl_M19_PPB_Flash_PreloadFontWin,
-    .IsRectTopmost = (PP_Bool (*)(PP_Instance instance, const struct PP_Rect* rect))&Pnacl_M19_PPB_Flash_IsRectTopmost,
-    .InvokePrinting = (int32_t (*)(PP_Instance instance))&Pnacl_M19_PPB_Flash_InvokePrinting,
-    .UpdateActivity = (void (*)(PP_Instance instance))&Pnacl_M19_PPB_Flash_UpdateActivity
-};
-
-struct PPB_Flash_12_2 Pnacl_Wrappers_PPB_Flash_12_2 = {
-    .SetInstanceAlwaysOnTop = (void (*)(PP_Instance instance, PP_Bool on_top))&Pnacl_M20_0_PPB_Flash_SetInstanceAlwaysOnTop,
-    .DrawGlyphs = (PP_Bool (*)(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]))&Pnacl_M20_0_PPB_Flash_DrawGlyphs,
-    .GetProxyForURL = (struct PP_Var (*)(PP_Instance instance, const char* url))&Pnacl_M20_0_PPB_Flash_GetProxyForURL,
-    .Navigate = (int32_t (*)(PP_Resource request_info, const char* target, PP_Bool from_user_action))&Pnacl_M20_0_PPB_Flash_Navigate,
-    .RunMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M20_0_PPB_Flash_RunMessageLoop,
-    .QuitMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M20_0_PPB_Flash_QuitMessageLoop,
-    .GetLocalTimeZoneOffset = (double (*)(PP_Instance instance, PP_Time t))&Pnacl_M20_0_PPB_Flash_GetLocalTimeZoneOffset,
-    .GetCommandLineArgs = (struct PP_Var (*)(PP_Module module))&Pnacl_M20_0_PPB_Flash_GetCommandLineArgs,
-    .PreloadFontWin = (void (*)(const void* logfontw))&Pnacl_M20_0_PPB_Flash_PreloadFontWin,
-    .IsRectTopmost = (PP_Bool (*)(PP_Instance instance, const struct PP_Rect* rect))&Pnacl_M20_0_PPB_Flash_IsRectTopmost,
-    .InvokePrinting = (int32_t (*)(PP_Instance instance))&Pnacl_M20_0_PPB_Flash_InvokePrinting,
-    .UpdateActivity = (void (*)(PP_Instance instance))&Pnacl_M20_0_PPB_Flash_UpdateActivity,
-    .GetDeviceID = (struct PP_Var (*)(PP_Instance instance))&Pnacl_M20_0_PPB_Flash_GetDeviceID
-};
-
-struct PPB_Flash_12_3 Pnacl_Wrappers_PPB_Flash_12_3 = {
-    .SetInstanceAlwaysOnTop = (void (*)(PP_Instance instance, PP_Bool on_top))&Pnacl_M20_1_PPB_Flash_SetInstanceAlwaysOnTop,
-    .DrawGlyphs = (PP_Bool (*)(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]))&Pnacl_M20_1_PPB_Flash_DrawGlyphs,
-    .GetProxyForURL = (struct PP_Var (*)(PP_Instance instance, const char* url))&Pnacl_M20_1_PPB_Flash_GetProxyForURL,
-    .Navigate = (int32_t (*)(PP_Resource request_info, const char* target, PP_Bool from_user_action))&Pnacl_M20_1_PPB_Flash_Navigate,
-    .RunMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M20_1_PPB_Flash_RunMessageLoop,
-    .QuitMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M20_1_PPB_Flash_QuitMessageLoop,
-    .GetLocalTimeZoneOffset = (double (*)(PP_Instance instance, PP_Time t))&Pnacl_M20_1_PPB_Flash_GetLocalTimeZoneOffset,
-    .GetCommandLineArgs = (struct PP_Var (*)(PP_Module module))&Pnacl_M20_1_PPB_Flash_GetCommandLineArgs,
-    .PreloadFontWin = (void (*)(const void* logfontw))&Pnacl_M20_1_PPB_Flash_PreloadFontWin,
-    .IsRectTopmost = (PP_Bool (*)(PP_Instance instance, const struct PP_Rect* rect))&Pnacl_M20_1_PPB_Flash_IsRectTopmost,
-    .InvokePrinting = (int32_t (*)(PP_Instance instance))&Pnacl_M20_1_PPB_Flash_InvokePrinting,
-    .UpdateActivity = (void (*)(PP_Instance instance))&Pnacl_M20_1_PPB_Flash_UpdateActivity,
-    .GetDeviceID = (struct PP_Var (*)(PP_Instance instance))&Pnacl_M20_1_PPB_Flash_GetDeviceID,
-    .GetSettingInt = (int32_t (*)(PP_Instance instance, PP_FlashSetting setting))&Pnacl_M20_1_PPB_Flash_GetSettingInt
-};
-
 struct PPB_Flash_12_4 Pnacl_Wrappers_PPB_Flash_12_4 = {
     .SetInstanceAlwaysOnTop = (void (*)(PP_Instance instance, PP_Bool on_top))&Pnacl_M21_PPB_Flash_SetInstanceAlwaysOnTop,
     .DrawGlyphs = (PP_Bool (*)(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]))&Pnacl_M21_PPB_Flash_DrawGlyphs,
@@ -4101,23 +3810,38 @@ struct PPB_Flash_12_5 Pnacl_Wrappers_PPB_Flash_12_5 = {
 };
 
 struct PPB_Flash_12_6 Pnacl_Wrappers_PPB_Flash_12_6 = {
-    .SetInstanceAlwaysOnTop = (void (*)(PP_Instance instance, PP_Bool on_top))&Pnacl_M24_PPB_Flash_SetInstanceAlwaysOnTop,
-    .DrawGlyphs = (PP_Bool (*)(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]))&Pnacl_M24_PPB_Flash_DrawGlyphs,
-    .GetProxyForURL = (struct PP_Var (*)(PP_Instance instance, const char* url))&Pnacl_M24_PPB_Flash_GetProxyForURL,
-    .Navigate = (int32_t (*)(PP_Resource request_info, const char* target, PP_Bool from_user_action))&Pnacl_M24_PPB_Flash_Navigate,
-    .RunMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M24_PPB_Flash_RunMessageLoop,
-    .QuitMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M24_PPB_Flash_QuitMessageLoop,
-    .GetLocalTimeZoneOffset = (double (*)(PP_Instance instance, PP_Time t))&Pnacl_M24_PPB_Flash_GetLocalTimeZoneOffset,
-    .GetCommandLineArgs = (struct PP_Var (*)(PP_Module module))&Pnacl_M24_PPB_Flash_GetCommandLineArgs,
-    .PreloadFontWin = (void (*)(const void* logfontw))&Pnacl_M24_PPB_Flash_PreloadFontWin,
-    .IsRectTopmost = (PP_Bool (*)(PP_Instance instance, const struct PP_Rect* rect))&Pnacl_M24_PPB_Flash_IsRectTopmost,
-    .InvokePrinting = (int32_t (*)(PP_Instance instance))&Pnacl_M24_PPB_Flash_InvokePrinting,
-    .UpdateActivity = (void (*)(PP_Instance instance))&Pnacl_M24_PPB_Flash_UpdateActivity,
-    .GetDeviceID = (struct PP_Var (*)(PP_Instance instance))&Pnacl_M24_PPB_Flash_GetDeviceID,
-    .GetSettingInt = (int32_t (*)(PP_Instance instance, PP_FlashSetting setting))&Pnacl_M24_PPB_Flash_GetSettingInt,
-    .GetSetting = (struct PP_Var (*)(PP_Instance instance, PP_FlashSetting setting))&Pnacl_M24_PPB_Flash_GetSetting,
-    .SetCrashData = (PP_Bool (*)(PP_Instance instance, PP_FlashCrashKey key, struct PP_Var value))&Pnacl_M24_PPB_Flash_SetCrashData,
-    .EnumerateVideoCaptureDevices = (int32_t (*)(PP_Instance instance, PP_Resource video_capture, struct PP_ArrayOutput devices))&Pnacl_M24_PPB_Flash_EnumerateVideoCaptureDevices
+    .SetInstanceAlwaysOnTop = (void (*)(PP_Instance instance, PP_Bool on_top))&Pnacl_M24_0_PPB_Flash_SetInstanceAlwaysOnTop,
+    .DrawGlyphs = (PP_Bool (*)(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]))&Pnacl_M24_0_PPB_Flash_DrawGlyphs,
+    .GetProxyForURL = (struct PP_Var (*)(PP_Instance instance, const char* url))&Pnacl_M24_0_PPB_Flash_GetProxyForURL,
+    .Navigate = (int32_t (*)(PP_Resource request_info, const char* target, PP_Bool from_user_action))&Pnacl_M24_0_PPB_Flash_Navigate,
+    .RunMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M24_0_PPB_Flash_RunMessageLoop,
+    .QuitMessageLoop = (void (*)(PP_Instance instance))&Pnacl_M24_0_PPB_Flash_QuitMessageLoop,
+    .GetLocalTimeZoneOffset = (double (*)(PP_Instance instance, PP_Time t))&Pnacl_M24_0_PPB_Flash_GetLocalTimeZoneOffset,
+    .GetCommandLineArgs = (struct PP_Var (*)(PP_Module module))&Pnacl_M24_0_PPB_Flash_GetCommandLineArgs,
+    .PreloadFontWin = (void (*)(const void* logfontw))&Pnacl_M24_0_PPB_Flash_PreloadFontWin,
+    .IsRectTopmost = (PP_Bool (*)(PP_Instance instance, const struct PP_Rect* rect))&Pnacl_M24_0_PPB_Flash_IsRectTopmost,
+    .InvokePrinting = (int32_t (*)(PP_Instance instance))&Pnacl_M24_0_PPB_Flash_InvokePrinting,
+    .UpdateActivity = (void (*)(PP_Instance instance))&Pnacl_M24_0_PPB_Flash_UpdateActivity,
+    .GetDeviceID = (struct PP_Var (*)(PP_Instance instance))&Pnacl_M24_0_PPB_Flash_GetDeviceID,
+    .GetSettingInt = (int32_t (*)(PP_Instance instance, PP_FlashSetting setting))&Pnacl_M24_0_PPB_Flash_GetSettingInt,
+    .GetSetting = (struct PP_Var (*)(PP_Instance instance, PP_FlashSetting setting))&Pnacl_M24_0_PPB_Flash_GetSetting,
+    .SetCrashData = (PP_Bool (*)(PP_Instance instance, PP_FlashCrashKey key, struct PP_Var value))&Pnacl_M24_0_PPB_Flash_SetCrashData,
+    .EnumerateVideoCaptureDevices = (int32_t (*)(PP_Instance instance, PP_Resource video_capture, struct PP_ArrayOutput devices))&Pnacl_M24_0_PPB_Flash_EnumerateVideoCaptureDevices
+};
+
+struct PPB_Flash_13_0 Pnacl_Wrappers_PPB_Flash_13_0 = {
+    .SetInstanceAlwaysOnTop = (void (*)(PP_Instance instance, PP_Bool on_top))&Pnacl_M24_1_PPB_Flash_SetInstanceAlwaysOnTop,
+    .DrawGlyphs = (PP_Bool (*)(PP_Instance instance, PP_Resource pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct PP_Point* position, const struct PP_Rect* clip, const float transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const uint16_t glyph_indices[], const struct PP_Point glyph_advances[]))&Pnacl_M24_1_PPB_Flash_DrawGlyphs,
+    .GetProxyForURL = (struct PP_Var (*)(PP_Instance instance, const char* url))&Pnacl_M24_1_PPB_Flash_GetProxyForURL,
+    .Navigate = (int32_t (*)(PP_Resource request_info, const char* target, PP_Bool from_user_action))&Pnacl_M24_1_PPB_Flash_Navigate,
+    .GetLocalTimeZoneOffset = (double (*)(PP_Instance instance, PP_Time t))&Pnacl_M24_1_PPB_Flash_GetLocalTimeZoneOffset,
+    .GetCommandLineArgs = (struct PP_Var (*)(PP_Module module))&Pnacl_M24_1_PPB_Flash_GetCommandLineArgs,
+    .PreloadFontWin = (void (*)(const void* logfontw))&Pnacl_M24_1_PPB_Flash_PreloadFontWin,
+    .IsRectTopmost = (PP_Bool (*)(PP_Instance instance, const struct PP_Rect* rect))&Pnacl_M24_1_PPB_Flash_IsRectTopmost,
+    .UpdateActivity = (void (*)(PP_Instance instance))&Pnacl_M24_1_PPB_Flash_UpdateActivity,
+    .GetSetting = (struct PP_Var (*)(PP_Instance instance, PP_FlashSetting setting))&Pnacl_M24_1_PPB_Flash_GetSetting,
+    .SetCrashData = (PP_Bool (*)(PP_Instance instance, PP_FlashCrashKey key, struct PP_Var value))&Pnacl_M24_1_PPB_Flash_SetCrashData,
+    .EnumerateVideoCaptureDevices = (int32_t (*)(PP_Instance instance, PP_Resource video_capture, struct PP_ArrayOutput devices))&Pnacl_M24_1_PPB_Flash_EnumerateVideoCaptureDevices
 };
 
 struct PPB_Flash_Clipboard_4_0 Pnacl_Wrappers_PPB_Flash_Clipboard_4_0 = {
@@ -4880,30 +4604,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileRefPrivate_0_1 = {
   .real_iface = NULL
 };
 
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_0 = {
-  .iface_macro = PPB_FLASH_INTERFACE_12_0,
-  .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Flash_12_0,
-  .real_iface = NULL
-};
-
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_1 = {
-  .iface_macro = PPB_FLASH_INTERFACE_12_1,
-  .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Flash_12_1,
-  .real_iface = NULL
-};
-
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_2 = {
-  .iface_macro = PPB_FLASH_INTERFACE_12_2,
-  .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Flash_12_2,
-  .real_iface = NULL
-};
-
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_3 = {
-  .iface_macro = PPB_FLASH_INTERFACE_12_3,
-  .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Flash_12_3,
-  .real_iface = NULL
-};
-
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_4 = {
   .iface_macro = PPB_FLASH_INTERFACE_12_4,
   .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Flash_12_4,
@@ -4922,6 +4622,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_6 = {
   .real_iface = NULL
 };
 
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_13_0 = {
+  .iface_macro = PPB_FLASH_INTERFACE_13_0,
+  .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Flash_13_0,
+  .real_iface = NULL
+};
+
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0 = {
   .iface_macro = PPB_FLASH_CLIPBOARD_INTERFACE_4_0,
   .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Flash_Clipboard_4_0,
@@ -5186,13 +4892,10 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
   &Pnacl_WrapperInfo_PPB_Zoom_Dev_0_2,
   &Pnacl_WrapperInfo_PPB_ContentDecryptor_Private_0_6,
   &Pnacl_WrapperInfo_PPB_FileRefPrivate_0_1,
-  &Pnacl_WrapperInfo_PPB_Flash_12_0,
-  &Pnacl_WrapperInfo_PPB_Flash_12_1,
-  &Pnacl_WrapperInfo_PPB_Flash_12_2,
-  &Pnacl_WrapperInfo_PPB_Flash_12_3,
   &Pnacl_WrapperInfo_PPB_Flash_12_4,
   &Pnacl_WrapperInfo_PPB_Flash_12_5,
   &Pnacl_WrapperInfo_PPB_Flash_12_6,
+  &Pnacl_WrapperInfo_PPB_Flash_13_0,
   &Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0,
   &Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_0,
   &Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0,
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 275a550..7ae4a0e 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -1316,10 +1316,6 @@ IPC_SYNC_MESSAGE_ROUTED4_1(PpapiHostMsg_PPBFlash_Navigate,
                            std::string /* target */,
                            PP_Bool /* from_user_action */,
                            int32_t /* result */)
-IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBFlash_RunMessageLoop,
-                           PP_Instance /* instance */)
-IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBFlash_QuitMessageLoop,
-                           PP_Instance /* instance */)
 IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFlash_GetLocalTimeZoneOffset,
                            PP_Instance /* instance */,
                            PP_Time /* t */,
@@ -1337,9 +1333,6 @@ IPC_SYNC_MESSAGE_ROUTED1_2(PpapiHostMsg_PPBFlash_FlashGetScreenSize,
                            PP_Bool /* result */,
                            PP_Size /* size */)
 IPC_MESSAGE_ROUTED0(PpapiHostMsg_PPBFlash_UpdateActivity)
-IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBFlash_GetDeviceID,
-                           PP_Instance /* instance */,
-                           ppapi::proxy::SerializedVar /* id */)
 IPC_SYNC_MESSAGE_ROUTED3_2(PpapiHostMsg_PPBFlash_OpenFileRef,
                            PP_Instance /* instance */,
                            ppapi::HostResource /* file_ref */,
diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc
index 23e335d..6104a45 100644
--- a/ppapi/proxy/ppb_flash_proxy.cc
+++ b/ppapi/proxy/ppb_flash_proxy.cc
@@ -110,10 +110,6 @@ bool PPB_Flash_Proxy::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_GetProxyForURL,
                         OnHostMsgGetProxyForURL)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_Navigate, OnHostMsgNavigate)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_RunMessageLoop,
-                        OnHostMsgRunMessageLoop)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_QuitMessageLoop,
-                        OnHostMsgQuitMessageLoop)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_GetLocalTimeZoneOffset,
                         OnHostMsgGetLocalTimeZoneOffset)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_IsRectTopmost,
@@ -126,8 +122,6 @@ bool PPB_Flash_Proxy::OnMessageReceived(const IPC::Message& msg) {
                         OnHostMsgOpenFileRef)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_QueryFileRef,
                         OnHostMsgQueryFileRef)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_GetDeviceID,
-                        OnHostMsgGetDeviceID)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_InvokePrinting,
                         OnHostMsgInvokePrinting)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_GetSetting,
@@ -218,18 +212,6 @@ int32_t PPB_Flash_Proxy::Navigate(PP_Instance instance,
   return result;
 }
 
-void PPB_Flash_Proxy::RunMessageLoop(PP_Instance instance) {
-  IPC::SyncMessage* msg = new PpapiHostMsg_PPBFlash_RunMessageLoop(
-      API_ID_PPB_FLASH, instance);
-  msg->EnableMessagePumping();
-  dispatcher()->Send(msg);
-}
-
-void PPB_Flash_Proxy::QuitMessageLoop(PP_Instance instance) {
-  dispatcher()->Send(new PpapiHostMsg_PPBFlash_QuitMessageLoop(
-      API_ID_PPB_FLASH, instance));
-}
-
 double PPB_Flash_Proxy::GetLocalTimeZoneOffset(PP_Instance instance,
                                                PP_Time t) {
   static double s_cached_t = 0.0;
@@ -289,31 +271,6 @@ void PPB_Flash_Proxy::UpdateActivity(PP_Instance instance) {
       new PpapiHostMsg_PPBFlash_UpdateActivity(API_ID_PPB_FLASH));
 }
 
-PP_Var PPB_Flash_Proxy::GetDeviceID(PP_Instance instance) {
-  ReceiveSerializedVarReturnValue result;
-  dispatcher()->Send(new PpapiHostMsg_PPBFlash_GetDeviceID(
-      API_ID_PPB_FLASH, instance, &result));
-  return result.Return(dispatcher());
-}
-
-int32_t PPB_Flash_Proxy::GetSettingInt(PP_Instance instance,
-                                       PP_FlashSetting setting) {
-  // Note: Don't add support for any more settings here. This method is
-  // deprecated.
-  switch (setting) {
-    case PP_FLASHSETTING_3DENABLED:
-      return static_cast<PluginDispatcher*>(dispatcher())->preferences().
-          is_3d_supported;
-    case PP_FLASHSETTING_INCOGNITO:
-      return static_cast<PluginDispatcher*>(dispatcher())->incognito();
-    case PP_FLASHSETTING_STAGE3DENABLED:
-      return static_cast<PluginDispatcher*>(dispatcher())->preferences().
-          is_stage3d_supported;
-    default:
-      return -1;
-  }
-}
-
 PP_Var PPB_Flash_Proxy::GetSetting(PP_Instance instance,
                                    PP_FlashSetting setting) {
   PluginDispatcher* plugin_dispatcher =
@@ -643,18 +600,6 @@ void PPB_Flash_Proxy::OnHostMsgNavigate(PP_Instance instance,
       instance, data, target.c_str(), from_user_action);
 }
 
-void PPB_Flash_Proxy::OnHostMsgRunMessageLoop(PP_Instance instance) {
-  EnterInstanceNoLock enter(instance);
-  if (enter.succeeded())
-    enter.functions()->GetFlashAPI()->RunMessageLoop(instance);
-}
-
-void PPB_Flash_Proxy::OnHostMsgQuitMessageLoop(PP_Instance instance) {
-  EnterInstanceNoLock enter(instance);
-  if (enter.succeeded())
-    enter.functions()->GetFlashAPI()->QuitMessageLoop(instance);
-}
-
 void PPB_Flash_Proxy::OnHostMsgGetLocalTimeZoneOffset(PP_Instance instance,
                                                   PP_Time t,
                                                   double* result) {
@@ -748,18 +693,6 @@ void PPB_Flash_Proxy::OnHostMsgGetSetting(PP_Instance instance,
   }
 }
 
-void PPB_Flash_Proxy::OnHostMsgGetDeviceID(PP_Instance instance,
-                                           SerializedVarReturnValue id) {
-  EnterInstanceNoLock enter(instance);
-  if (enter.succeeded()) {
-    id.Return(dispatcher(),
-                  enter.functions()->GetFlashAPI()->GetDeviceID(
-                      instance));
-  } else {
-    id.Return(dispatcher(), PP_MakeUndefined());
-  }
-}
-
 void PPB_Flash_Proxy::OnHostMsgInvokePrinting(PP_Instance instance) {
   // This function is actually implemented in the PPB_Flash_Print interface.
   // It's rarely used enough that we just request this interface when needed.
diff --git a/ppapi/proxy/ppb_flash_proxy.h b/ppapi/proxy/ppb_flash_proxy.h
index 09728ef..1c644bf 100644
--- a/ppapi/proxy/ppb_flash_proxy.h
+++ b/ppapi/proxy/ppb_flash_proxy.h
@@ -73,16 +73,11 @@ class PPB_Flash_Proxy : public InterfaceProxy, public PPB_Flash_Shared {
                            const URLRequestInfoData& data,
                            const char* target,
                            PP_Bool from_user_action) OVERRIDE;
-  virtual void RunMessageLoop(PP_Instance instance) OVERRIDE;
-  virtual void QuitMessageLoop(PP_Instance instance) OVERRIDE;
   virtual double GetLocalTimeZoneOffset(PP_Instance instance,
                                         PP_Time t) OVERRIDE;
   virtual PP_Bool IsRectTopmost(PP_Instance instance,
                                 const PP_Rect* rect) OVERRIDE;
   virtual void UpdateActivity(PP_Instance instance) OVERRIDE;
-  virtual PP_Var GetDeviceID(PP_Instance instance) OVERRIDE;
-  virtual int32_t GetSettingInt(PP_Instance instance,
-                                PP_FlashSetting setting) OVERRIDE;
   virtual PP_Var GetSetting(PP_Instance instance,
                             PP_FlashSetting setting) OVERRIDE;
   virtual PP_Bool SetCrashData(PP_Instance instance,
@@ -139,8 +134,6 @@ class PPB_Flash_Proxy : public InterfaceProxy, public PPB_Flash_Shared {
                          const std::string& target,
                          PP_Bool from_user_action,
                          int32_t* result);
-  void OnHostMsgRunMessageLoop(PP_Instance instance);
-  void OnHostMsgQuitMessageLoop(PP_Instance instance);
   void OnHostMsgGetLocalTimeZoneOffset(PP_Instance instance, PP_Time t,
                                        double* result);
   void OnHostMsgIsRectTopmost(PP_Instance instance,
@@ -161,8 +154,6 @@ class PPB_Flash_Proxy : public InterfaceProxy, public PPB_Flash_Shared {
                              const ppapi::HostResource& host_resource,
                              PP_FileInfo* info,
                              int32_t* result);
-  void OnHostMsgGetDeviceID(PP_Instance instance,
-                            SerializedVarReturnValue id);
   void OnHostMsgGetSetting(PP_Instance instance,
                            PP_FlashSetting setting,
                            SerializedVarReturnValue result);
diff --git a/ppapi/tests/test_flash.cc b/ppapi/tests/test_flash.cc
index 458de78..28cbf65 100644
--- a/ppapi/tests/test_flash.cc
+++ b/ppapi/tests/test_flash.cc
@@ -8,11 +8,13 @@
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
+#include "ppapi/cpp/private/flash.h"
 #include "ppapi/cpp/var.h"
 #include "ppapi/tests/testing_instance.h"
 
 REGISTER_TEST_CASE(Flash);
 
+using pp::flash::Flash;
 using pp::Var;
 
 TestFlash::TestFlash(TestingInstance* instance)
@@ -20,72 +22,45 @@ TestFlash::TestFlash(TestingInstance* instance)
       PP_ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) {
 }
 
-bool TestFlash::Init() {
-  flash_interface_ = static_cast<const PPB_Flash*>(
-      pp::Module::Get()->GetBrowserInterface(PPB_FLASH_INTERFACE));
-  return !!flash_interface_;
-}
-
 void TestFlash::RunTests(const std::string& filter) {
   RUN_TEST(SetInstanceAlwaysOnTop, filter);
   RUN_TEST(GetProxyForURL, filter);
-  RUN_TEST(MessageLoop, filter);
   RUN_TEST(GetLocalTimeZoneOffset, filter);
   RUN_TEST(GetCommandLineArgs, filter);
-  RUN_TEST(GetDeviceID, filter);
-  RUN_TEST(GetSettingInt, filter);
   RUN_TEST(GetSetting, filter);
   RUN_TEST(SetCrashData, filter);
 }
 
 std::string TestFlash::TestSetInstanceAlwaysOnTop() {
-  flash_interface_->SetInstanceAlwaysOnTop(instance_->pp_instance(), PP_TRUE);
-  flash_interface_->SetInstanceAlwaysOnTop(instance_->pp_instance(), PP_FALSE);
+  Flash::SetInstanceAlwaysOnTop(instance_, PP_TRUE);
+  Flash::SetInstanceAlwaysOnTop(instance_, PP_FALSE);
   PASS();
 }
 
 std::string TestFlash::TestGetProxyForURL() {
-  Var result(pp::PASS_REF,
-             flash_interface_->GetProxyForURL(instance_->pp_instance(),
-                                              "http://127.0.0.1/foobar/"));
+  Var result = Flash::GetProxyForURL(instance_, "http://127.0.0.1/foobar/");
   ASSERT_TRUE(result.is_string());
   // Assume no one configures a proxy for localhost.
   ASSERT_EQ("DIRECT", result.AsString());
 
-  result = Var(pp::PASS_REF,
-               flash_interface_->GetProxyForURL(instance_->pp_instance(),
-                                                "http://www.google.com"));
+  result = Flash::GetProxyForURL(instance_, "http://www.google.com");
   // Don't know what the proxy might be, but it should be a valid result.
   ASSERT_TRUE(result.is_string());
 
-  result = Var(pp::PASS_REF,
-               flash_interface_->GetProxyForURL(instance_->pp_instance(),
-                                                "file:///tmp"));
+  result = Flash::GetProxyForURL(instance_, "file:///tmp");
   ASSERT_TRUE(result.is_string());
   // Should get "DIRECT" for file:// URLs.
   ASSERT_EQ("DIRECT", result.AsString());
 
-  result = Var(pp::PASS_REF,
-               flash_interface_->GetProxyForURL(instance_->pp_instance(),
-                                                "this_isnt_an_url"));
+  result = Flash::GetProxyForURL(instance_, "this_isnt_an_url");
   // Should be an error.
   ASSERT_TRUE(result.is_undefined());
 
   PASS();
 }
 
-std::string TestFlash::TestMessageLoop() {
-  pp::CompletionCallback callback =
-      callback_factory_.NewCallback(&TestFlash::QuitMessageLoopTask);
-  pp::Module::Get()->core()->CallOnMainThread(0, callback);
-  flash_interface_->RunMessageLoop(instance_->pp_instance());
-
-  PASS();
-}
-
 std::string TestFlash::TestGetLocalTimeZoneOffset() {
-  double result = flash_interface_->GetLocalTimeZoneOffset(
-      instance_->pp_instance(), 1321491298.0);
+  double result = Flash::GetLocalTimeZoneOffset(instance_, 1321491298.0);
   // The result depends on the local time zone, but +/- 14h from UTC should
   // cover the possibilities.
   ASSERT_TRUE(result >= -14 * 60 * 60);
@@ -95,83 +70,41 @@ std::string TestFlash::TestGetLocalTimeZoneOffset() {
 }
 
 std::string TestFlash::TestGetCommandLineArgs() {
-  Var result(pp::PASS_REF,
-             flash_interface_->GetCommandLineArgs(
-                 pp::Module::Get()->pp_module()));
+  Var result = Flash::GetCommandLineArgs(pp::Module::Get());
   ASSERT_TRUE(result.is_string());
 
   PASS();
 }
 
-std::string TestFlash::TestGetDeviceID() {
-  Var result(pp::PASS_REF,
-             flash_interface_->GetDeviceID(instance_->pp_instance()));
-  // TODO(wad) figure out how to mock the input and test the full flow.
-  ASSERT_TRUE(result.is_string());
-  PASS();
-}
-
-std::string TestFlash::TestGetSettingInt() {
-  // This only works out of process.
-  if (testing_interface_->IsOutOfProcess()) {
-    int32_t is_3denabled = flash_interface_->GetSettingInt(
-        instance_->pp_instance(), PP_FLASHSETTING_3DENABLED);
-    ASSERT_TRUE(is_3denabled == 0 || is_3denabled == 1);
-
-    int32_t is_incognito = flash_interface_->GetSettingInt(
-        instance_->pp_instance(), PP_FLASHSETTING_INCOGNITO);
-    ASSERT_TRUE(is_incognito == 0 || is_incognito == 1);
-
-    int32_t is_stage3denabled = flash_interface_->GetSettingInt(
-        instance_->pp_instance(), PP_FLASHSETTING_STAGE3DENABLED);
-    // This may "fail" if 3d isn't enabled.
-    ASSERT_TRUE((is_stage3denabled == 0 || is_stage3denabled == 1) ||
-                (is_stage3denabled == -1 && is_3denabled == 0));
-  }
-
-  // Invalid instance cases.
-  int32_t result = flash_interface_->GetSettingInt(
-      0, PP_FLASHSETTING_3DENABLED);
-  ASSERT_EQ(-1, result);
-  result = flash_interface_->GetSettingInt(0, PP_FLASHSETTING_INCOGNITO);
-  ASSERT_EQ(-1, result);
-  result = flash_interface_->GetSettingInt(0, PP_FLASHSETTING_STAGE3DENABLED);
-  ASSERT_EQ(-1, result);
-
-  PASS();
-}
-
 std::string TestFlash::TestGetSetting() {
   // This only works out of process.
   if (testing_interface_->IsOutOfProcess()) {
-    Var is_3denabled(pp::PASS_REF, flash_interface_->GetSetting(
-        instance_->pp_instance(), PP_FLASHSETTING_3DENABLED));
+    Var is_3denabled = Flash::GetSetting(instance_, PP_FLASHSETTING_3DENABLED);
     ASSERT_TRUE(is_3denabled.is_bool());
 
-    Var is_incognito(pp::PASS_REF, flash_interface_->GetSetting(
-        instance_->pp_instance(), PP_FLASHSETTING_INCOGNITO));
+    Var is_incognito = Flash::GetSetting(instance_, PP_FLASHSETTING_INCOGNITO);
     ASSERT_TRUE(is_incognito.is_bool());
 
-    Var is_stage3denabled(pp::PASS_REF, flash_interface_->GetSetting(
-        instance_->pp_instance(), PP_FLASHSETTING_STAGE3DENABLED));
+    Var is_stage3denabled = Flash::GetSetting(instance_,
+                                              PP_FLASHSETTING_STAGE3DENABLED);
     // This may "fail" if 3d isn't enabled.
     ASSERT_TRUE(is_stage3denabled.is_bool() ||
                 (is_stage3denabled.is_undefined() && !is_3denabled.AsBool()));
 
-    Var num_cores(pp::PASS_REF, flash_interface_->GetSetting(
-        instance_->pp_instance(), PP_FLASHSETTING_NUMCORES));
+    Var num_cores = Flash::GetSetting(instance_, PP_FLASHSETTING_NUMCORES);
     ASSERT_TRUE(num_cores.is_int() && num_cores.AsInt() > 0);
   }
 
   // Invalid instance cases.
-  Var result(pp::PASS_REF,
-             flash_interface_->GetSetting(0, PP_FLASHSETTING_3DENABLED));
+  Var result = Flash::GetSetting(
+      pp::InstanceHandle(static_cast<PP_Instance>(0)),
+      PP_FLASHSETTING_3DENABLED);
   ASSERT_TRUE(result.is_undefined());
-  result = Var(pp::PASS_REF,
-               flash_interface_->GetSetting(0, PP_FLASHSETTING_INCOGNITO));
+  result = Flash::GetSetting(pp::InstanceHandle(static_cast<PP_Instance>(0)),
+                             PP_FLASHSETTING_INCOGNITO);
   ASSERT_TRUE(result.is_undefined());
-  result = Var(pp::PASS_REF,
-               flash_interface_->GetSetting(0, PP_FLASHSETTING_STAGE3DENABLED));
+  result = Flash::GetSetting(pp::InstanceHandle(static_cast<PP_Instance>(0)),
+                             PP_FLASHSETTING_STAGE3DENABLED);
   ASSERT_TRUE(result.is_undefined());
 
   PASS();
@@ -179,13 +112,7 @@ std::string TestFlash::TestGetSetting() {
 
 std::string TestFlash::TestSetCrashData() {
   pp::Var url("http://...");
-  ASSERT_TRUE(flash_interface_->SetCrashData(instance_->pp_instance(),
-                                             PP_FLASHCRASHKEY_URL,
-                                             url.pp_var()));
+  ASSERT_TRUE(Flash::SetCrashData(instance_, PP_FLASHCRASHKEY_URL, url));
 
   PASS();
 }
-
-void TestFlash::QuitMessageLoopTask(int32_t) {
-  flash_interface_->QuitMessageLoop(instance_->pp_instance());
-}
diff --git a/ppapi/tests/test_flash.h b/ppapi/tests/test_flash.h
index 0643db2..f3f6276 100644
--- a/ppapi/tests/test_flash.h
+++ b/ppapi/tests/test_flash.h
@@ -17,7 +17,6 @@ class TestFlash : public TestCase {
   explicit TestFlash(TestingInstance* instance);
 
   // TestCase implementation.
-  virtual bool Init();
   virtual void RunTests(const std::string& filter);
 
  private:
@@ -26,17 +25,11 @@ class TestFlash : public TestCase {
   // std::string TestDrawGlyphs();
   std::string TestGetProxyForURL();
   // std::string TestNavigate();
-  std::string TestMessageLoop();
   std::string TestGetLocalTimeZoneOffset();
   std::string TestGetCommandLineArgs();
-  std::string TestGetDeviceID();
-  std::string TestGetSettingInt();
   std::string TestGetSetting();
   std::string TestSetCrashData();
 
-  void QuitMessageLoopTask(int32_t);
-
-  const PPB_Flash* flash_interface_;
   pp::CompletionCallbackFactory<TestFlash> callback_factory_;
 };
 
diff --git a/ppapi/thunk/interfaces_ppb_private_flash.h b/ppapi/thunk/interfaces_ppb_private_flash.h
index c230e17..ec2147d 100644
--- a/ppapi/thunk/interfaces_ppb_private_flash.h
+++ b/ppapi/thunk/interfaces_ppb_private_flash.h
@@ -9,18 +9,6 @@
 
 PROXIED_API(PPB_Flash)
 PROXIED_IFACE(PPB_Flash,
-              PPB_FLASH_INTERFACE_12_0,
-              PPB_Flash_12_0)
-PROXIED_IFACE(PPB_Flash,
-              PPB_FLASH_INTERFACE_12_1,
-              PPB_Flash_12_1)
-PROXIED_IFACE(PPB_Flash,
-              PPB_FLASH_INTERFACE_12_2,
-              PPB_Flash_12_2)
-PROXIED_IFACE(PPB_Flash,
-              PPB_FLASH_INTERFACE_12_3,
-              PPB_Flash_12_3)
-PROXIED_IFACE(PPB_Flash,
               PPB_FLASH_INTERFACE_12_4,
             PPB_Flash_12_4)
 PROXIED_IFACE(PPB_Flash,
@@ -29,6 +17,9 @@ PROXIED_IFACE(PPB_Flash,
 PROXIED_IFACE(PPB_Flash,
               PPB_FLASH_INTERFACE_12_6,
               PPB_Flash_12_6)
+PROXIED_IFACE(PPB_Flash,
+              PPB_FLASH_INTERFACE_13_0,
+              PPB_Flash_13_0)
 
 PROXIED_IFACE(PPB_Flash,
               PPB_FLASH_FILE_MODULELOCAL_INTERFACE_2_0,
diff --git a/ppapi/thunk/ppb_flash_api.h b/ppapi/thunk/ppb_flash_api.h
index 1a7ed5b..aa70d3a 100644
--- a/ppapi/thunk/ppb_flash_api.h
+++ b/ppapi/thunk/ppb_flash_api.h
@@ -54,14 +54,9 @@ class PPAPI_THUNK_EXPORT PPB_Flash_API {
                            const char* target,
                            PP_Bool from_user_action) = 0;
 
-  virtual void RunMessageLoop(PP_Instance instance) = 0;
-  virtual void QuitMessageLoop(PP_Instance instance) = 0;
   virtual double GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) = 0;
   virtual PP_Bool IsRectTopmost(PP_Instance instance, const PP_Rect* rect) = 0;
   virtual void UpdateActivity(PP_Instance instance) = 0;
-  virtual PP_Var GetDeviceID(PP_Instance instance) = 0;
-  virtual int32_t GetSettingInt(PP_Instance instance,
-                                PP_FlashSetting setting) = 0;
   virtual PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting) = 0;
   virtual PP_Bool SetCrashData(PP_Instance instance,
                                PP_FlashCrashKey key,
diff --git a/ppapi/thunk/ppb_flash_thunk.cc b/ppapi/thunk/ppb_flash_thunk.cc
index ec8e17e..15b132a 100644
--- a/ppapi/thunk/ppb_flash_thunk.cc
+++ b/ppapi/thunk/ppb_flash_thunk.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/logging.h"
 #include "ppapi/c/pp_array_output.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash.h"
@@ -74,17 +75,15 @@ int32_t Navigate(PP_Resource request_id,
 }
 
 void RunMessageLoop(PP_Instance instance) {
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->GetFlashAPI()->RunMessageLoop(instance);
+  // Deprecated.
+  NOTREACHED();
+  return;
 }
 
 void QuitMessageLoop(PP_Instance instance) {
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->GetFlashAPI()->QuitMessageLoop(instance);
+  // Deprecated.
+  NOTREACHED();
+  return;
 }
 
 double GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) {
@@ -127,17 +126,15 @@ void UpdateActivity(PP_Instance instance) {
 }
 
 PP_Var GetDeviceID(PP_Instance instance) {
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return PP_MakeUndefined();
-  return enter.functions()->GetFlashAPI()->GetDeviceID(instance);
+  // Deprecated.
+  NOTREACHED();
+  return PP_MakeUndefined();
 }
 
 int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting) {
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return -1;
-  return enter.functions()->GetFlashAPI()->GetSettingInt(instance, setting);
+  // Deprecated.
+  NOTREACHED();
+  return -1;
 }
 
 PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting) {
@@ -165,50 +162,7 @@ int32_t EnumerateVideoCaptureDevices(PP_Instance instance,
   return enter.object()->EnumerateDevicesSync(devices);
 }
 
-const PPB_Flash_12_0 g_ppb_flash_12_0_thunk = {
-  &SetInstanceAlwaysOnTop,
-  &DrawGlyphs,
-  &GetProxyForURL,
-  &Navigate,
-  &RunMessageLoop,
-  &QuitMessageLoop,
-  &GetLocalTimeZoneOffset,
-  &GetCommandLineArgs,
-  &PreLoadFontWin
-};
-
-const PPB_Flash_12_1 g_ppb_flash_12_1_thunk = {
-  &SetInstanceAlwaysOnTop,
-  &DrawGlyphs,
-  &GetProxyForURL,
-  &Navigate,
-  &RunMessageLoop,
-  &QuitMessageLoop,
-  &GetLocalTimeZoneOffset,
-  &GetCommandLineArgs,
-  &PreLoadFontWin,
-  &IsRectTopmost,
-  &InvokePrinting,
-  &UpdateActivity
-};
-
-const PPB_Flash_12_2 g_ppb_flash_12_2_thunk = {
-  &SetInstanceAlwaysOnTop,
-  &DrawGlyphs,
-  &GetProxyForURL,
-  &Navigate,
-  &RunMessageLoop,
-  &QuitMessageLoop,
-  &GetLocalTimeZoneOffset,
-  &GetCommandLineArgs,
-  &PreLoadFontWin,
-  &IsRectTopmost,
-  &InvokePrinting,
-  &UpdateActivity,
-  &GetDeviceID
-};
-
-const PPB_Flash_12_3 g_ppb_flash_12_3_thunk = {
+const PPB_Flash_12_4 g_ppb_flash_12_4_thunk = {
   &SetInstanceAlwaysOnTop,
   &DrawGlyphs,
   &GetProxyForURL,
@@ -222,10 +176,11 @@ const PPB_Flash_12_3 g_ppb_flash_12_3_thunk = {
   &InvokePrinting,
   &UpdateActivity,
   &GetDeviceID,
-  &GetSettingInt
+  &GetSettingInt,
+  &GetSetting
 };
 
-const PPB_Flash_12_4 g_ppb_flash_12_4_thunk = {
+const PPB_Flash_12_5 g_ppb_flash_12_5_thunk = {
   &SetInstanceAlwaysOnTop,
   &DrawGlyphs,
   &GetProxyForURL,
@@ -240,10 +195,11 @@ const PPB_Flash_12_4 g_ppb_flash_12_4_thunk = {
   &UpdateActivity,
   &GetDeviceID,
   &GetSettingInt,
-  &GetSetting
+  &GetSetting,
+  &SetCrashData
 };
 
-const PPB_Flash_12_5 g_ppb_flash_12_5_thunk = {
+const PPB_Flash_12_6 g_ppb_flash_12_6_thunk = {
   &SetInstanceAlwaysOnTop,
   &DrawGlyphs,
   &GetProxyForURL,
@@ -259,24 +215,20 @@ const PPB_Flash_12_5 g_ppb_flash_12_5_thunk = {
   &GetDeviceID,
   &GetSettingInt,
   &GetSetting,
-  &SetCrashData
+  &SetCrashData,
+  &EnumerateVideoCaptureDevices
 };
 
-const PPB_Flash_12_6 g_ppb_flash_12_6_thunk = {
+const PPB_Flash_13_0 g_ppb_flash_13_0_thunk = {
   &SetInstanceAlwaysOnTop,
   &DrawGlyphs,
   &GetProxyForURL,
   &Navigate,
-  &RunMessageLoop,
-  &QuitMessageLoop,
   &GetLocalTimeZoneOffset,
   &GetCommandLineArgs,
   &PreLoadFontWin,
   &IsRectTopmost,
-  &InvokePrinting,
   &UpdateActivity,
-  &GetDeviceID,
-  &GetSettingInt,
   &GetSetting,
   &SetCrashData,
   &EnumerateVideoCaptureDevices
@@ -284,22 +236,6 @@ const PPB_Flash_12_6 g_ppb_flash_12_6_thunk = {
 
 }  // namespace
 
-const PPB_Flash_12_0* GetPPB_Flash_12_0_Thunk() {
-  return &g_ppb_flash_12_0_thunk;
-}
-
-const PPB_Flash_12_1* GetPPB_Flash_12_1_Thunk() {
-  return &g_ppb_flash_12_1_thunk;
-}
-
-const PPB_Flash_12_2* GetPPB_Flash_12_2_Thunk() {
-  return &g_ppb_flash_12_2_thunk;
-}
-
-const PPB_Flash_12_3* GetPPB_Flash_12_3_Thunk() {
-  return &g_ppb_flash_12_3_thunk;
-}
-
 const PPB_Flash_12_4* GetPPB_Flash_12_4_Thunk() {
   return &g_ppb_flash_12_4_thunk;
 }
@@ -312,5 +248,9 @@ const PPB_Flash_12_6* GetPPB_Flash_12_6_Thunk() {
   return &g_ppb_flash_12_6_thunk;
 }
 
+const PPB_Flash_13_0* GetPPB_Flash_13_0_Thunk() {
+  return &g_ppb_flash_13_0_thunk;
+}
+
 }  // namespace thunk
 }  // namespace ppapi
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc
index 756770f..84a19ba 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.cc
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc
@@ -461,10 +461,6 @@ int MockPluginDelegate::EnumerateDevices(
 void MockPluginDelegate::StopEnumerateDevices(int request_id) {
 }
 
-std::string MockPluginDelegate::GetDeviceID() {
-  return std::string();
-}
-
 PP_FlashLSORestrictions MockPluginDelegate::GetLocalDataRestrictions(
     const GURL& document_url,
     const GURL& plugin_url) {
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h
index 886823f..cb3a10e 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.h
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.h
@@ -204,7 +204,6 @@ class MockPluginDelegate : public PluginDelegate {
   virtual int EnumerateDevices(PP_DeviceType_Dev type,
                                const EnumerateDevicesCallback& callback);
   virtual void StopEnumerateDevices(int request_id);
-  virtual std::string GetDeviceID();
   virtual PP_FlashLSORestrictions GetLocalDataRestrictions(
       const GURL& document_url,
       const GURL& plugin_url);
diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h
index 5995feb..6f4f9bf 100644
--- a/webkit/plugins/ppapi/plugin_delegate.h
+++ b/webkit/plugins/ppapi/plugin_delegate.h
@@ -658,9 +658,6 @@ class PluginDelegate {
   // is the return value of EnumerateDevicesCallback.
   virtual void StopEnumerateDevices(int request_id) = 0;
 
-  // Returns a Device ID
-  virtual std::string GetDeviceID() = 0;
-
   // Returns restrictions on local data handled by the plug-in.
   virtual PP_FlashLSORestrictions GetLocalDataRestrictions(
       const GURL& document_url,
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc
index ccad022..64aa797 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_impl.cc
@@ -7,7 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "base/message_loop.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
@@ -190,15 +189,6 @@ int32_t PPB_Flash_Impl::Navigate(PP_Instance instance,
   return instance_->Navigate(data, target, PP_ToBool(from_user_action));
 }
 
-void PPB_Flash_Impl::RunMessageLoop(PP_Instance instance) {
-  MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
-  MessageLoop::current()->Run();
-}
-
-void PPB_Flash_Impl::QuitMessageLoop(PP_Instance instance) {
-  MessageLoop::current()->QuitNow();
-}
-
 double PPB_Flash_Impl::GetLocalTimeZoneOffset(PP_Instance instance,
                                               PP_Time t) {
   // Evil hack. The time code handles exact "0" values as special, and produces
@@ -225,17 +215,6 @@ void PPB_Flash_Impl::UpdateActivity(PP_Instance pp_instance) {
   // Not supported in-process.
 }
 
-PP_Var PPB_Flash_Impl::GetDeviceID(PP_Instance pp_instance) {
-  std::string id = instance_->delegate()->GetDeviceID();
-  return StringVar::StringToPPVar(id);
-}
-
-int32_t PPB_Flash_Impl::GetSettingInt(PP_Instance instance,
-                                      PP_FlashSetting setting) {
-  // No current settings are supported in-process.
-  return -1;
-}
-
 PP_Var PPB_Flash_Impl::GetSetting(PP_Instance instance,
                                   PP_FlashSetting setting) {
   switch(setting) {
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h
index c7edb45..85289ec 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.h
+++ b/webkit/plugins/ppapi/ppb_flash_impl.h
@@ -44,16 +44,11 @@ class PPB_Flash_Impl : public ::ppapi::PPB_Flash_Shared {
                            const ::ppapi::URLRequestInfoData& data,
                            const char* target,
                            PP_Bool from_user_action) OVERRIDE;
-  virtual void RunMessageLoop(PP_Instance instance) OVERRIDE;
-  virtual void QuitMessageLoop(PP_Instance instance) OVERRIDE;
   virtual double GetLocalTimeZoneOffset(PP_Instance instance,
                                         PP_Time t) OVERRIDE;
   virtual PP_Bool IsRectTopmost(PP_Instance instance,
                                 const PP_Rect* rect) OVERRIDE;
   virtual void UpdateActivity(PP_Instance instance) OVERRIDE;
-  virtual PP_Var GetDeviceID(PP_Instance instance) OVERRIDE;
-  virtual int32_t GetSettingInt(PP_Instance instance,
-                                PP_FlashSetting setting) OVERRIDE;
   virtual PP_Var GetSetting(PP_Instance instance,
                             PP_FlashSetting setting) OVERRIDE;
   virtual PP_Bool SetCrashData(PP_Instance instance,