8 files changed, 49 insertions, 32 deletions
diff --git a/chromium/ppapi/proxy/enter_proxy.h b/chromium/ppapi/proxy/enter_proxy.h
index b7dbef288c6..c57879fc4d5 100644
--- a/chromium/ppapi/proxy/enter_proxy.h
+++ b/chromium/ppapi/proxy/enter_proxy.h
@@ -7,7 +7,8 @@
 
 #include <stdint.h>
 
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
diff --git a/chromium/ppapi/proxy/pdf_resource.cc b/chromium/ppapi/proxy/pdf_resource.cc
index 48addd20cb5..de83fb6c1e0 100644
--- a/chromium/ppapi/proxy/pdf_resource.cc
+++ b/chromium/ppapi/proxy/pdf_resource.cc
@@ -226,32 +226,7 @@ void PDFResource::SetAccessibilityPageInfo(
   text_run_vector.reserve(page_info->text_run_count);
   for (size_t i = 0; i < page_info->text_run_count; i++)
     text_run_vector.emplace_back(text_runs[i]);
-  std::vector<ppapi::PdfAccessibilityLinkInfo> link_vector;
-  link_vector.reserve(page_objects->link_count);
-  for (size_t i = 0; i < page_objects->link_count; i++) {
-    link_vector.emplace_back(page_objects->links[i]);
-  }
-  std::vector<ppapi::PdfAccessibilityImageInfo> image_vector;
-  image_vector.reserve(page_objects->image_count);
-  for (size_t i = 0; i < page_objects->image_count; i++) {
-    image_vector.emplace_back(page_objects->images[i]);
-  }
-  std::vector<ppapi::PdfAccessibilityHighlightInfo> highlight_vector;
-  highlight_vector.reserve(page_objects->highlight_count);
-  for (size_t i = 0; i < page_objects->highlight_count; i++) {
-    highlight_vector.emplace_back(page_objects->highlights[i]);
-  }
-  std::vector<ppapi::PdfAccessibilityTextFieldInfo> text_field_vector;
-  text_field_vector.reserve(page_objects->text_field_count);
-  for (size_t i = 0; i < page_objects->text_field_count; i++) {
-    text_field_vector.emplace_back(page_objects->text_fields[i]);
-  }
-
-  ppapi::PdfAccessibilityPageObjects ppapi_page_objects;
-  ppapi_page_objects.links = std::move(link_vector);
-  ppapi_page_objects.images = std::move(image_vector);
-  ppapi_page_objects.highlights = std::move(highlight_vector);
-  ppapi_page_objects.text_fields = std::move(text_field_vector);
+  ppapi::PdfAccessibilityPageObjects ppapi_page_objects(*page_objects);
 
   Post(RENDERER,
        PpapiHostMsg_PDF_SetAccessibilityPageInfo(
diff --git a/chromium/ppapi/proxy/ppapi_messages.h b/chromium/ppapi/proxy/ppapi_messages.h
index e610cb13ba6..bf83177f6e8 100644
--- a/chromium/ppapi/proxy/ppapi_messages.h
+++ b/chromium/ppapi/proxy/ppapi_messages.h
@@ -159,6 +159,10 @@ IPC_ENUM_TRAITS_MAX_VALUE(PP_PdfAccessibilityScrollAlignment,
                           PP_PDF_ACCESSIBILITYSCROLLALIGNMENT_LAST)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_PdfAccessibilityAnnotationType,
                           PP_PDF_ACCESSIBILITY_ANNOTATIONTYPE_LAST)
+IPC_ENUM_TRAITS_MAX_VALUE(PP_PrivateChoiceFieldType, PP_PRIVATECHOICEFIELD_LAST)
+IPC_ENUM_TRAITS_MIN_MAX_VALUE(PP_PrivateButtonType,
+                              PP_PRIVATEBUTTON_FIRST,
+                              PP_PRIVATEBUTTON_LAST)
 
 IPC_STRUCT_TRAITS_BEGIN(PP_Point)
   IPC_STRUCT_TRAITS_MEMBER(x)
@@ -346,11 +350,48 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::PdfAccessibilityTextFieldInfo)
   IPC_STRUCT_TRAITS_MEMBER(bounds)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(ppapi::PdfAccessibilityChoiceFieldOptionInfo)
+  IPC_STRUCT_TRAITS_MEMBER(name)
+  IPC_STRUCT_TRAITS_MEMBER(is_selected)
+  IPC_STRUCT_TRAITS_MEMBER(bounds)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(ppapi::PdfAccessibilityChoiceFieldInfo)
+  IPC_STRUCT_TRAITS_MEMBER(name)
+  IPC_STRUCT_TRAITS_MEMBER(options)
+  IPC_STRUCT_TRAITS_MEMBER(type)
+  IPC_STRUCT_TRAITS_MEMBER(is_read_only)
+  IPC_STRUCT_TRAITS_MEMBER(is_multi_select)
+  IPC_STRUCT_TRAITS_MEMBER(has_editable_text_box)
+  IPC_STRUCT_TRAITS_MEMBER(index_in_page)
+  IPC_STRUCT_TRAITS_MEMBER(text_run_index)
+  IPC_STRUCT_TRAITS_MEMBER(bounds)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(ppapi::PdfAccessibilityButtonInfo)
+  IPC_STRUCT_TRAITS_MEMBER(name)
+  IPC_STRUCT_TRAITS_MEMBER(value)
+  IPC_STRUCT_TRAITS_MEMBER(type)
+  IPC_STRUCT_TRAITS_MEMBER(is_read_only)
+  IPC_STRUCT_TRAITS_MEMBER(is_checked)
+  IPC_STRUCT_TRAITS_MEMBER(control_count)
+  IPC_STRUCT_TRAITS_MEMBER(control_index)
+  IPC_STRUCT_TRAITS_MEMBER(index_in_page)
+  IPC_STRUCT_TRAITS_MEMBER(text_run_index)
+  IPC_STRUCT_TRAITS_MEMBER(bounds)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(ppapi::PdfAccessibilityFormFieldInfo)
+  IPC_STRUCT_TRAITS_MEMBER(text_fields)
+  IPC_STRUCT_TRAITS_MEMBER(choice_fields)
+  IPC_STRUCT_TRAITS_MEMBER(buttons)
+IPC_STRUCT_TRAITS_END()
+
 IPC_STRUCT_TRAITS_BEGIN(ppapi::PdfAccessibilityPageObjects)
   IPC_STRUCT_TRAITS_MEMBER(links)
   IPC_STRUCT_TRAITS_MEMBER(images)
   IPC_STRUCT_TRAITS_MEMBER(highlights)
-  IPC_STRUCT_TRAITS_MEMBER(text_fields)
+  IPC_STRUCT_TRAITS_MEMBER(form_fields)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(PP_URLComponent_Dev)
diff --git a/chromium/ppapi/proxy/proxy_array_output.h b/chromium/ppapi/proxy/proxy_array_output.h
index 455b026d33e..075879b4ff1 100644
--- a/chromium/ppapi/proxy/proxy_array_output.h
+++ b/chromium/ppapi/proxy/proxy_array_output.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_array_output.h"
 
diff --git a/chromium/ppapi/proxy/proxy_completion_callback_factory.h b/chromium/ppapi/proxy/proxy_completion_callback_factory.h
index 4b8bafe676a..2765827c8cb 100644
--- a/chromium/ppapi/proxy/proxy_completion_callback_factory.h
+++ b/chromium/ppapi/proxy/proxy_completion_callback_factory.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/sequence_checker.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/utility/completion_callback_factory.h"
diff --git a/chromium/ppapi/proxy/raw_var_data.cc b/chromium/ppapi/proxy/raw_var_data.cc
index c1940827460..ee87df2ee19 100644
--- a/chromium/ppapi/proxy/raw_var_data.cc
+++ b/chromium/ppapi/proxy/raw_var_data.cc
@@ -5,6 +5,7 @@
 #include "ppapi/proxy/raw_var_data.h"
 
 #include "base/containers/stack.h"
+#include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "base/stl_util.h"
diff --git a/chromium/ppapi/proxy/serialized_handle.h b/chromium/ppapi/proxy/serialized_handle.h
index 92370446772..4e1d1ec0981 100644
--- a/chromium/ppapi/proxy/serialized_handle.h
+++ b/chromium/ppapi/proxy/serialized_handle.h
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "base/atomicops.h"
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/memory/platform_shared_memory_region.h"
 #include "base/memory/read_only_shared_memory_region.h"
 #include "base/memory/ref_counted.h"
diff --git a/chromium/ppapi/proxy/serialized_structs.h b/chromium/ppapi/proxy/serialized_structs.h
index 0c95cbe34c6..522d61795ae 100644
--- a/chromium/ppapi/proxy/serialized_structs.h
+++ b/chromium/ppapi/proxy/serialized_structs.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
 #include "build/build_config.h"
 #include "ppapi/c/dev/ppb_truetype_font_dev.h"
 #include "ppapi/c/pp_bool.h"