BASELINE: Update Chromium to 67.0.3396.47

Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

14 files changed, 57 insertions, 523 deletions

diff --git a/chromium/ppapi/thunk/BUILD.gn b/chromium/ppapi/thunk/BUILD.gn
index 73c7af4c5b8..5e0d034896b 100644
--- a/chromium/ppapi/thunk/BUILD.gn
+++ b/chromium/ppapi/thunk/BUILD.gn
@@ -105,10 +105,7 @@ source_set("thunk") {
     "ppb_network_monitor_thunk.cc",
     "ppb_network_proxy_api.h",
     "ppb_network_proxy_thunk.cc",
-    "ppb_output_protection_api.h",
-    "ppb_output_protection_private_thunk.cc",
     "ppb_pdf_api.h",
-    "ppb_platform_verification_api.h",
     "ppb_printing_api.h",
     "ppb_printing_dev_thunk.cc",
     "ppb_tcp_server_socket_private_api.h",
@@ -169,7 +166,6 @@ source_set("thunk") {
       "ppb_browser_font_trusted_thunk.cc",
       "ppb_buffer_thunk.cc",
       "ppb_char_set_thunk.cc",
-      "ppb_content_decryptor_private_thunk.cc",
       "ppb_flash_clipboard_thunk.cc",
       "ppb_flash_device_id_thunk.cc",
       "ppb_flash_drm_thunk.cc",
@@ -182,7 +178,6 @@ source_set("thunk") {
       "ppb_flash_thunk.cc",
       "ppb_gles_chromium_texture_mapping_thunk.cc",
       "ppb_pdf_thunk.cc",
-      "ppb_platform_verification_private_thunk.cc",
       "ppb_url_util_thunk.cc",
       "ppb_video_capture_thunk.cc",
       "ppb_video_decoder_dev_thunk.cc",
diff --git a/chromium/ppapi/thunk/interfaces_ppb_private.h b/chromium/ppapi/thunk/interfaces_ppb_private.h
index 02db8a62d56..bb81ab64f16 100644
--- a/chromium/ppapi/thunk/interfaces_ppb_private.h
+++ b/chromium/ppapi/thunk/interfaces_ppb_private.h
@@ -5,6 +5,8 @@
 // Please see inteface_ppb_public_stable for the documentation on the format of
 // this file.
 
+// no-include-guard-because-multiply-included
+
 #include "ppapi/thunk/interfaces_preamble.h"
 
 // See interfaces_ppb_private_no_permissions.h for other private interfaces.
@@ -23,8 +25,6 @@ PROXIED_IFACE(PPB_BROKER_TRUSTED_INTERFACE_0_3,
               PPB_BrokerTrusted_0_3)
 PROXIED_IFACE(PPB_BROWSERFONT_TRUSTED_INTERFACE_1_0,
               PPB_BrowserFont_Trusted_1_0)
-PROXIED_IFACE(PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_15,
-              PPB_ContentDecryptor_Private_0_15)
 PROXIED_IFACE(PPB_CHARSET_TRUSTED_INTERFACE_1_0,
               PPB_CharSet_Trusted_1_0)
 PROXIED_IFACE(PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5,
@@ -33,20 +33,10 @@ PROXIED_IFACE(PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6,
               PPB_FileChooserTrusted_0_6)
 PROXIED_IFACE(PPB_FILEREFPRIVATE_INTERFACE_0_1,
               PPB_FileRefPrivate_0_1)
-PROXIED_IFACE(PPB_FIND_PRIVATE_INTERFACE_0_3,
-              PPB_Find_Private_0_3)
 PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_0_1,
               PPB_FlashFullscreen_0_1)
 PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_1_0,
               PPB_FlashFullscreen_0_1)
-PROXIED_IFACE(PPB_OUTPUTPROTECTION_PRIVATE_INTERFACE_0_1,
-              PPB_OutputProtection_Private_0_1)
-PROXIED_IFACE(PPB_PDF_INTERFACE,
-              PPB_PDF)
-PROXIED_IFACE(PPB_PLATFORMVERIFICATION_PRIVATE_INTERFACE_0_3,
-              PPB_PlatformVerification_Private_0_3)
-PROXIED_IFACE(PPB_URLLOADERTRUSTED_INTERFACE_0_3,
-              PPB_URLLoaderTrusted_0_3)
 #endif  // !defined(OS_NACL)
 
 #include "ppapi/thunk/interfaces_postamble.h"
diff --git a/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h b/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h
index 297648f6ec6..2b64de2a2c2 100644
--- a/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h
+++ b/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h
@@ -56,4 +56,8 @@ PROXIED_IFACE(PPB_VIDEOSOURCE_PRIVATE_INTERFACE_0_1,
 PROXIED_IFACE(PPB_UMA_PRIVATE_INTERFACE_0_3,
               PPB_UMA_Private_0_3)
 
+// This has permission checks done in pepper_url_loader_host.cc
+PROXIED_IFACE(PPB_URLLOADERTRUSTED_INTERFACE_0_3,
+              PPB_URLLoaderTrusted_0_3)
+
 #include "ppapi/thunk/interfaces_postamble.h"
diff --git a/chromium/ppapi/thunk/interfaces_ppb_private_pdf.h b/chromium/ppapi/thunk/interfaces_ppb_private_pdf.h
new file mode 100644
index 00000000000..f28dcaf4b2f
--- /dev/null
+++ b/chromium/ppapi/thunk/interfaces_ppb_private_pdf.h
@@ -0,0 +1,19 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Please see inteface_ppb_public_stable for the documentation on the format of
+// this file.
+
+// no-include-guard-because-multiply-included
+
+#include "ppapi/thunk/interfaces_preamble.h"
+
+// See interfaces_ppb_private_no_permissions.h for other private interfaces.
+
+#if !defined(OS_NACL)
+PROXIED_IFACE(PPB_PDF_INTERFACE, PPB_PDF)
+PROXIED_IFACE(PPB_FIND_PRIVATE_INTERFACE_0_3, PPB_Find_Private_0_3)
+#endif  // !defined(OS_NACL)
+
+#include "ppapi/thunk/interfaces_postamble.h"
diff --git a/chromium/ppapi/thunk/ppb_content_decryptor_private_thunk.cc b/chromium/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
deleted file mode 100644
index b8d19f4a45c..00000000000
--- a/chromium/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// From private/ppb_content_decryptor_private.idl modified Mon Mar 30 22:35:33
-// 2015.
-
-#include <stdint.h>
-
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/private/ppb_content_decryptor_private.h"
-#include "ppapi/shared_impl/tracked_callback.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppapi_thunk_export.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-void PromiseResolved(PP_Instance instance, uint32_t promise_id) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::PromiseResolved()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->PromiseResolved(instance, promise_id);
-}
-
-void PromiseResolvedWithKeyStatus(PP_Instance instance,
-                                  uint32_t promise_id,
-                                  PP_CdmKeyStatus key_status) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::PromiseResolvedWithKeyStatus()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->PromiseResolvedWithKeyStatus(instance, promise_id,
-                                                  key_status);
-}
-
-void PromiseResolvedWithSession(PP_Instance instance,
-                                uint32_t promise_id,
-                                struct PP_Var session_id) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::PromiseResolvedWithSession()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->PromiseResolvedWithSession(instance, promise_id,
-                                                session_id);
-}
-
-void PromiseRejected(PP_Instance instance,
-                     uint32_t promise_id,
-                     PP_CdmExceptionCode exception_code,
-                     uint32_t system_code,
-                     struct PP_Var error_description) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::PromiseRejected()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->PromiseRejected(instance, promise_id, exception_code,
-                                     system_code, error_description);
-}
-
-void SessionMessage(PP_Instance instance,
-                    struct PP_Var session_id,
-                    PP_CdmMessageType message_type,
-                    struct PP_Var message,
-                    struct PP_Var legacy_destination_url) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::SessionMessage()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->SessionMessage(instance, session_id, message_type, message,
-                                    legacy_destination_url);
-}
-
-void SessionKeysChange(PP_Instance instance,
-                       struct PP_Var session_id,
-                       PP_Bool has_additional_usable_key,
-                       uint32_t key_count,
-                       const struct PP_KeyInformation key_information[]) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::SessionKeysChange()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->SessionKeysChange(instance, session_id,
-                                       has_additional_usable_key, key_count,
-                                       key_information);
-}
-
-void SessionExpirationChange(PP_Instance instance,
-                             struct PP_Var session_id,
-                             PP_Time new_expiry_time) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::SessionExpirationChange()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->SessionExpirationChange(instance, session_id,
-                                             new_expiry_time);
-}
-
-void SessionClosed(PP_Instance instance, struct PP_Var session_id) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::SessionClosed()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->SessionClosed(instance, session_id);
-}
-
-void LegacySessionError(PP_Instance instance,
-                        struct PP_Var session_id,
-                        PP_CdmExceptionCode exception_code,
-                        uint32_t system_code,
-                        struct PP_Var error_description) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::LegacySessionError()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->LegacySessionError(instance, session_id, exception_code,
-                                        system_code, error_description);
-}
-
-void DeliverBlock(PP_Instance instance,
-                  PP_Resource decrypted_block,
-                  const struct PP_DecryptedBlockInfo* decrypted_block_info) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::DeliverBlock()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->DeliverBlock(instance, decrypted_block,
-                                  decrypted_block_info);
-}
-
-void DecoderInitializeDone(PP_Instance instance,
-                           PP_DecryptorStreamType decoder_type,
-                           uint32_t request_id,
-                           PP_Bool success) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::DecoderInitializeDone()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->DecoderInitializeDone(instance, decoder_type, request_id,
-                                           success);
-}
-
-void DecoderDeinitializeDone(PP_Instance instance,
-                             PP_DecryptorStreamType decoder_type,
-                             uint32_t request_id) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::DecoderDeinitializeDone()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->DecoderDeinitializeDone(instance, decoder_type,
-                                             request_id);
-}
-
-void DecoderResetDone(PP_Instance instance,
-                      PP_DecryptorStreamType decoder_type,
-                      uint32_t request_id) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::DecoderResetDone()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->DecoderResetDone(instance, decoder_type, request_id);
-}
-
-void DeliverFrame(PP_Instance instance,
-                  PP_Resource decrypted_frame,
-                  const struct PP_DecryptedFrameInfo* decrypted_frame_info) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::DeliverFrame()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->DeliverFrame(instance, decrypted_frame,
-                                  decrypted_frame_info);
-}
-
-void DeliverSamples(
-    PP_Instance instance,
-    PP_Resource audio_frames,
-    const struct PP_DecryptedSampleInfo* decrypted_sample_info) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::DeliverSamples()";
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->DeliverSamples(instance, audio_frames,
-                                    decrypted_sample_info);
-}
-
-const PPB_ContentDecryptor_Private_0_15
-    g_ppb_contentdecryptor_private_thunk_0_15 = {&PromiseResolved,
-                                                 &PromiseResolvedWithKeyStatus,
-                                                 &PromiseResolvedWithSession,
-                                                 &PromiseRejected,
-                                                 &SessionMessage,
-                                                 &SessionKeysChange,
-                                                 &SessionExpirationChange,
-                                                 &SessionClosed,
-                                                 &LegacySessionError,
-                                                 &DeliverBlock,
-                                                 &DecoderInitializeDone,
-                                                 &DecoderDeinitializeDone,
-                                                 &DecoderResetDone,
-                                                 &DeliverFrame,
-                                                 &DeliverSamples};
-
-}  // namespace
-
-PPAPI_THUNK_EXPORT const PPB_ContentDecryptor_Private_0_15*
-GetPPB_ContentDecryptor_Private_0_15_Thunk() {
-  return &g_ppb_contentdecryptor_private_thunk_0_15;
-}
-
-}  // namespace thunk
-}  // namespace ppapi
diff --git a/chromium/ppapi/thunk/ppb_instance_api.h b/chromium/ppapi/thunk/ppb_instance_api.h
index af89f53173d..390e2ce7586 100644
--- a/chromium/ppapi/thunk/ppb_instance_api.h
+++ b/chromium/ppapi/thunk/ppb_instance_api.h
@@ -20,7 +20,6 @@
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_mouse_cursor.h"
 #include "ppapi/c/ppb_text_input_controller.h"
-#include "ppapi/c/private/pp_content_decryptor.h"
 #include "ppapi/c/private/ppb_instance_private.h"
 #include "ppapi/shared_impl/api_id.h"
 #include "ppapi/shared_impl/resource.h"
@@ -31,8 +30,6 @@
 #undef PostMessage
 #endif
 
-struct PP_DecryptedBlockInfo;
-struct PP_DecryptedFrameInfo;
 struct PPP_MessageHandler_0_2;
 
 namespace ppapi {
@@ -147,59 +144,6 @@ class PPB_Instance_API {
   virtual PP_Var GetDocumentURL(PP_Instance instance,
                                 PP_URLComponents_Dev* components) = 0;
 #if !defined(OS_NACL)
-  // Content Decryptor.
-  virtual void PromiseResolved(PP_Instance instance, uint32_t promise_id) = 0;
-  virtual void PromiseResolvedWithKeyStatus(PP_Instance instance,
-                                            uint32_t promise_id,
-                                            PP_CdmKeyStatus key_status) = 0;
-  virtual void PromiseResolvedWithSession(PP_Instance instance,
-                                          uint32_t promise_id,
-                                          PP_Var session_id_var) = 0;
-  virtual void PromiseRejected(PP_Instance instance,
-                               uint32_t promise_id,
-                               PP_CdmExceptionCode exception_code,
-                               uint32_t system_code,
-                               PP_Var error_description_var) = 0;
-  virtual void SessionMessage(PP_Instance instance,
-                              PP_Var session_id_var,
-                              PP_CdmMessageType message_type,
-                              PP_Var message_var,
-                              PP_Var legacy_destination_url_var) = 0;
-  virtual void SessionKeysChange(
-      PP_Instance instance,
-      PP_Var session_id_var,
-      PP_Bool has_additional_usable_key,
-      uint32_t key_count,
-      const struct PP_KeyInformation key_information[]) = 0;
-  virtual void SessionExpirationChange(PP_Instance instance,
-                                       PP_Var session_id_var,
-                                       PP_Time new_expiry_time) = 0;
-  virtual void SessionClosed(PP_Instance instance, PP_Var session_id_var) = 0;
-  virtual void LegacySessionError(PP_Instance instance,
-                                  PP_Var session_id_var,
-                                  PP_CdmExceptionCode exception_code,
-                                  uint32_t system_code,
-                                  PP_Var error_description_var) = 0;
-  virtual void DeliverBlock(PP_Instance instance,
-                            PP_Resource decrypted_block,
-                            const PP_DecryptedBlockInfo* block_info) = 0;
-  virtual void DecoderInitializeDone(PP_Instance instance,
-                                     PP_DecryptorStreamType decoder_type,
-                                     uint32_t request_id,
-                                     PP_Bool success) = 0;
-  virtual void DecoderDeinitializeDone(PP_Instance instance,
-                                       PP_DecryptorStreamType decoder_type,
-                                       uint32_t request_id) = 0;
-  virtual void DecoderResetDone(PP_Instance instance,
-                                PP_DecryptorStreamType decoder_type,
-                                uint32_t request_id) = 0;
-  virtual void DeliverFrame(PP_Instance instance,
-                            PP_Resource decrypted_frame,
-                            const PP_DecryptedFrameInfo* frame_info) = 0;
-  virtual void DeliverSamples(PP_Instance instance,
-                              PP_Resource audio_frames,
-                              const PP_DecryptedSampleInfo* sample_info) = 0;
-
   // URLUtil.
   virtual PP_Var ResolveRelativeToDocument(
       PP_Instance instance,
diff --git a/chromium/ppapi/thunk/ppb_output_protection_api.h b/chromium/ppapi/thunk/ppb_output_protection_api.h
deleted file mode 100644
index a139a73b1ec..00000000000
--- a/chromium/ppapi/thunk/ppb_output_protection_api.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef PPAPI_THUNK_OUTPUT_PROTECTION_API_H_
-#define PPAPI_THUNK_OUTPUT_PROTECTION_API_H_
-
-#include <stdint.h>
-
-#include "ppapi/c/private/ppb_output_protection_private.h"
-
-namespace ppapi {
-
-class TrackedCallback;
-
-namespace thunk {
-
-class PPB_OutputProtection_API {
- public:
-  virtual ~PPB_OutputProtection_API() {}
-
-  virtual int32_t QueryStatus(
-      uint32_t* link_mask,
-      uint32_t* protection_mask,
-      const scoped_refptr<TrackedCallback>& callback) = 0;
-  virtual int32_t EnableProtection(
-      uint32_t desired_method_mask,
-      const scoped_refptr<TrackedCallback>& callback) = 0;
-};
-
-}  // namespace thunk
-}  // namespace ppapi
-
-#endif  // PPAPI_THUNK_OUTPUT_PROTECTION_API_H_
diff --git a/chromium/ppapi/thunk/ppb_output_protection_private_thunk.cc b/chromium/ppapi/thunk/ppb_output_protection_private_thunk.cc
deleted file mode 100644
index 8cd0a0c58d3..00000000000
--- a/chromium/ppapi/thunk/ppb_output_protection_private_thunk.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// From private/ppb_output_protection_private.idl modified Wed Jan 27 17:10:16
-// 2016.
-
-#include <stdint.h>
-
-#include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/private/ppb_output_protection_private.h"
-#include "ppapi/shared_impl/tracked_callback.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppapi_thunk_export.h"
-#include "ppapi/thunk/ppb_output_protection_api.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-PP_Resource Create(PP_Instance instance) {
-  VLOG(4) << "PPB_OutputProtection_Private::Create()";
-  EnterResourceCreation enter(instance);
-  if (enter.failed())
-    return 0;
-  return enter.functions()->CreateOutputProtectionPrivate(instance);
-}
-
-PP_Bool IsOutputProtection(PP_Resource resource) {
-  VLOG(4) << "PPB_OutputProtection_Private::IsOutputProtection()";
-  EnterResource<PPB_OutputProtection_API> enter(resource, false);
-  return PP_FromBool(enter.succeeded());
-}
-
-int32_t QueryStatus(PP_Resource resource,
-                    uint32_t* link_mask,
-                    uint32_t* protection_mask,
-                    struct PP_CompletionCallback callback) {
-  VLOG(4) << "PPB_OutputProtection_Private::QueryStatus()";
-  EnterResource<PPB_OutputProtection_API> enter(resource, callback, true);
-  if (enter.failed())
-    return enter.retval();
-  return enter.SetResult(enter.object()->QueryStatus(link_mask, protection_mask,
-                                                     enter.callback()));
-}
-
-int32_t EnableProtection(PP_Resource resource,
-                         uint32_t desired_protection_mask,
-                         struct PP_CompletionCallback callback) {
-  VLOG(4) << "PPB_OutputProtection_Private::EnableProtection()";
-  EnterResource<PPB_OutputProtection_API> enter(resource, callback, true);
-  if (enter.failed())
-    return enter.retval();
-  return enter.SetResult(enter.object()->EnableProtection(
-      desired_protection_mask, enter.callback()));
-}
-
-const PPB_OutputProtection_Private_0_1
-    g_ppb_outputprotection_private_thunk_0_1 = {
-        &Create, &IsOutputProtection, &QueryStatus, &EnableProtection};
-
-}  // namespace
-
-PPAPI_THUNK_EXPORT const PPB_OutputProtection_Private_0_1*
-GetPPB_OutputProtection_Private_0_1_Thunk() {
-  return &g_ppb_outputprotection_private_thunk_0_1;
-}
-
-}  // namespace thunk
-}  // namespace ppapi
diff --git a/chromium/ppapi/thunk/ppb_pdf_api.h b/chromium/ppapi/thunk/ppb_pdf_api.h
index adb7b9b73d6..ff07729ebee 100644
--- a/chromium/ppapi/thunk/ppb_pdf_api.h
+++ b/chromium/ppapi/thunk/ppb_pdf_api.h
@@ -23,6 +23,10 @@ class PPB_PDF_API {
   virtual void SetContentRestriction(int restrictions) = 0;
   virtual void UserMetricsRecordAction(const PP_Var& action) = 0;
   virtual void HasUnsupportedFeature() = 0;
+  virtual void ShowAlertDialog(const char* message) = 0;
+  virtual bool ShowConfirmDialog(const char* message) = 0;
+  virtual PP_Var ShowPromptDialog(const char* message,
+                                  const char* default_answer) = 0;
   virtual void SaveAs() = 0;
   virtual PP_Bool IsFeatureEnabled(PP_PDFFeature feature) = 0;
   virtual void Print() = 0;
@@ -45,7 +49,6 @@ class PPB_PDF_API {
                                 int32_t left_height,
                                 const PP_FloatPoint& right,
                                 int32_t right_height) = 0;
-  virtual void DidScroll() = 0;
 
   static const SingletonResourceID kSingletonResourceID = PDF_SINGLETON_ID;
 };
diff --git a/chromium/ppapi/thunk/ppb_pdf_thunk.cc b/chromium/ppapi/thunk/ppb_pdf_thunk.cc
index c80977a8141..d6a9bf4c909 100644
--- a/chromium/ppapi/thunk/ppb_pdf_thunk.cc
+++ b/chromium/ppapi/thunk/ppb_pdf_thunk.cc
@@ -86,6 +86,28 @@ void HasUnsupportedFeature(PP_Instance instance) {
     enter.functions()->HasUnsupportedFeature();
 }
 
+void ShowAlertDialog(PP_Instance instance, const char* message) {
+  EnterInstanceAPI<PPB_PDF_API> enter(instance);
+  if (enter.succeeded())
+    enter.functions()->ShowAlertDialog(message);
+}
+
+bool ShowConfirmDialog(PP_Instance instance, const char* message) {
+  EnterInstanceAPI<PPB_PDF_API> enter(instance);
+  if (enter.succeeded())
+    return enter.functions()->ShowConfirmDialog(message);
+  return false;
+}
+
+PP_Var ShowPromptDialog(PP_Instance instance,
+                        const char* message,
+                        const char* default_answer) {
+  EnterInstanceAPI<PPB_PDF_API> enter(instance);
+  if (enter.succeeded())
+    return enter.functions()->ShowPromptDialog(message, default_answer);
+  return PP_MakeUndefined();
+}
+
 void SaveAs(PP_Instance instance) {
   EnterInstanceAPI<PPB_PDF_API> enter(instance);
   if (enter.succeeded())
@@ -180,13 +202,6 @@ void SelectionChanged(PP_Instance instance,
   enter.functions()->SelectionChanged(*left, left_height, *right, right_height);
 }
 
-void DidScroll(PP_Instance instance) {
-  EnterInstanceAPI<PPB_PDF_API> enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->DidScroll();
-}
-
 const PPB_PDF g_ppb_pdf_thunk = {
     &GetFontFileWithFallback,
     &GetFontTableForPrivateFontFile,
@@ -207,7 +222,9 @@ const PPB_PDF g_ppb_pdf_thunk = {
     &SetAccessibilityPageInfo,
     &SetCrashData,
     &SelectionChanged,
-    &DidScroll,
+    &ShowAlertDialog,
+    &ShowConfirmDialog,
+    &ShowPromptDialog,
 };
 
 }  // namespace
diff --git a/chromium/ppapi/thunk/ppb_platform_verification_api.h b/chromium/ppapi/thunk/ppb_platform_verification_api.h
deleted file mode 100644
index ea98f0d8518..00000000000
--- a/chromium/ppapi/thunk/ppb_platform_verification_api.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef PPAPI_THUNK_PPB_PLATFORM_VERIFICATION_API_H_
-#define PPAPI_THUNK_PPB_PLATFORM_VERIFICATION_API_H_
-
-#include <stdint.h>
-
-#include "base/memory/ref_counted.h"
-#include "ppapi/thunk/ppapi_thunk_export.h"
-
-namespace ppapi {
-
-class TrackedCallback;
-
-namespace thunk {
-
-class PPAPI_THUNK_EXPORT PPB_PlatformVerification_API {
- public:
-  virtual ~PPB_PlatformVerification_API() {}
-
-  virtual int32_t ChallengePlatform(
-      const PP_Var& service_id,
-      const PP_Var& challenge,
-      PP_Var* signed_data,
-      PP_Var* signed_data_signature,
-      PP_Var* platform_key_certificate,
-      const scoped_refptr<TrackedCallback>& callback) = 0;
-
-  virtual int32_t GetStorageId(
-      PP_Var* storage_id,
-      const scoped_refptr<TrackedCallback>& callback) = 0;
-};
-
-}  // namespace thunk
-}  // namespace ppapi
-
-#endif  // PPAPI_THUNK_PPB_PLATFORM_VERIFICATION_API_H_
diff --git a/chromium/ppapi/thunk/ppb_platform_verification_private_thunk.cc b/chromium/ppapi/thunk/ppb_platform_verification_private_thunk.cc
deleted file mode 100644
index bc50ae59bb6..00000000000
--- a/chromium/ppapi/thunk/ppb_platform_verification_private_thunk.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// From private/ppb_platform_verification_private.idl modified Fri Jun  9
-// 14:13:47 2017.
-
-#include <stdint.h>
-
-#include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/private/ppb_platform_verification_private.h"
-#include "ppapi/shared_impl/tracked_callback.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppapi_thunk_export.h"
-#include "ppapi/thunk/ppb_platform_verification_api.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-PP_Resource Create(PP_Instance instance) {
-  VLOG(4) << "PPB_PlatformVerification_Private::Create()";
-  EnterResourceCreation enter(instance);
-  if (enter.failed())
-    return 0;
-  return enter.functions()->CreatePlatformVerificationPrivate(instance);
-}
-
-PP_Bool IsPlatformVerification(PP_Resource resource) {
-  VLOG(4) << "PPB_PlatformVerification_Private::IsPlatformVerification()";
-  EnterResource<PPB_PlatformVerification_API> enter(resource, false);
-  return PP_FromBool(enter.succeeded());
-}
-
-int32_t ChallengePlatform(PP_Resource instance,
-                          struct PP_Var service_id,
-                          struct PP_Var challenge,
-                          struct PP_Var* signed_data,
-                          struct PP_Var* signed_data_signature,
-                          struct PP_Var* platform_key_certificate,
-                          struct PP_CompletionCallback callback) {
-  VLOG(4) << "PPB_PlatformVerification_Private::ChallengePlatform()";
-  EnterResource<PPB_PlatformVerification_API> enter(instance, callback, true);
-  if (enter.failed())
-    return enter.retval();
-  return enter.SetResult(enter.object()->ChallengePlatform(
-      service_id, challenge, signed_data, signed_data_signature,
-      platform_key_certificate, enter.callback()));
-}
-
-int32_t GetStorageId(PP_Resource instance,
-                     struct PP_Var* storage_id,
-                     struct PP_CompletionCallback callback) {
-  VLOG(4) << "PPB_PlatformVerification_Private::GetStorageId()";
-  EnterResource<PPB_PlatformVerification_API> enter(instance, callback, true);
-  if (enter.failed())
-    return enter.retval();
-  return enter.SetResult(
-      enter.object()->GetStorageId(storage_id, enter.callback()));
-}
-
-const PPB_PlatformVerification_Private_0_3
-    g_ppb_platformverification_private_thunk_0_3 = {
-        &Create, &IsPlatformVerification, &ChallengePlatform, &GetStorageId};
-
-}  // namespace
-
-PPAPI_THUNK_EXPORT const PPB_PlatformVerification_Private_0_3*
-GetPPB_PlatformVerification_Private_0_3_Thunk() {
-  return &g_ppb_platformverification_private_thunk_0_3;
-}
-
-}  // namespace thunk
-}  // namespace ppapi
diff --git a/chromium/ppapi/thunk/resource_creation_api.h b/chromium/ppapi/thunk/resource_creation_api.h
index af6ae901ede..3d4f60e07f1 100644
--- a/chromium/ppapi/thunk/resource_creation_api.h
+++ b/chromium/ppapi/thunk/resource_creation_api.h
@@ -171,7 +171,6 @@ class ResourceCreationAPI {
       PP_Instance instance,
       const PP_NetAddress_Private& private_addr) = 0;
   virtual PP_Resource CreateNetworkMonitor(PP_Instance instance) = 0;
-  virtual PP_Resource CreateOutputProtectionPrivate(PP_Instance instance) = 0;
   virtual PP_Resource CreatePrinting(PP_Instance instance) = 0;
   virtual PP_Resource CreateTCPServerSocketPrivate(PP_Instance instance) = 0;
   virtual PP_Resource CreateTCPSocket1_0(PP_Instance instace) = 0;
@@ -202,8 +201,6 @@ class ResourceCreationAPI {
   virtual PP_Resource CreateFlashMenu(PP_Instance instance,
                                       const PP_Flash_Menu* menu_data) = 0;
   virtual PP_Resource CreateFlashMessageLoop(PP_Instance instance) = 0;
-  virtual PP_Resource CreatePlatformVerificationPrivate(
-      PP_Instance instance) = 0;
   virtual PP_Resource CreateVideoCapture(PP_Instance instance) = 0;
   virtual PP_Resource CreateVideoDecoderDev(
       PP_Instance instance,
diff --git a/chromium/ppapi/thunk/thunk.h b/chromium/ppapi/thunk/thunk.h
index 3d4a77f3f77..54b3ded030d 100644
--- a/chromium/ppapi/thunk/thunk.h
+++ b/chromium/ppapi/thunk/thunk.h
@@ -19,11 +19,12 @@
   } }
 
 #include "ppapi/thunk/interfaces_ppb_private.h"
-#include "ppapi/thunk/interfaces_ppb_private_no_permissions.h"
 #include "ppapi/thunk/interfaces_ppb_private_flash.h"
-#include "ppapi/thunk/interfaces_ppb_public_stable.h"
+#include "ppapi/thunk/interfaces_ppb_private_no_permissions.h"
+#include "ppapi/thunk/interfaces_ppb_private_pdf.h"
 #include "ppapi/thunk/interfaces_ppb_public_dev.h"
 #include "ppapi/thunk/interfaces_ppb_public_dev_channel.h"
+#include "ppapi/thunk/interfaces_ppb_public_stable.h"
 
 #undef PROXIED_IFACE