)]}'
{
  "commit": "cb798258c433bec7087948fcbfff14d1e7683006",
  "tree": "bc873a405dbfe7c957d75a1748acce11c7f473e7",
  "parents": [
    "c5709dd345c748016a637b2104544895223f8fc7"
  ],
  "author": {
    "name": "Tom Sepez",
    "email": "tsepez@chromium.org",
    "time": "Mon Sep 17 18:25:32 2018 +0000"
  },
  "committer": {
    "name": "Chromium commit bot",
    "email": "commit-bot@chromium.org",
    "time": "Mon Sep 17 18:25:32 2018 +0000"
  },
  "message": "Fix final/protected conflicts.\n\nClasses marked |final| should not have |protected| members. In turn,\n\"private field m_dwEncryptObjNum is not used\" warning is produced.\n\nChange-Id: I51a96aca5a5f499381a6764d892962f7f2dc0327\nReviewed-on: https://pdfium-review.googlesource.com/42611\nReviewed-by: Lei Zhang \u003cthestig@chromium.org\u003e\nCommit-Queue: Tom Sepez \u003ctsepez@chromium.org\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "7aeb54b877b3bb71b358dd9c5f6ca08be1378a4a",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/font/cpdf_cidfont.h",
      "new_id": "5cbeeda7f50f5fa7c9644cbee8d748a072a03f95",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/font/cpdf_cidfont.h"
    },
    {
      "type": "modify",
      "old_id": "a3066d74fadb6867032c218f86b1d527c1e8646c",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/font/cpdf_truetypefont.h",
      "new_id": "158a5df85cc0672e595821f5efec69cca2742590",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/font/cpdf_truetypefont.h"
    },
    {
      "type": "modify",
      "old_id": "d85bf701df6fe31c9605c1f7d2c4fe783f8d6745",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/font/cpdf_type3font.h",
      "new_id": "fb323236428f6cb43180b9ec5f92176130c3cbd9",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/font/cpdf_type3font.h"
    },
    {
      "type": "modify",
      "old_id": "6ab751e4dda62a4b03a820807502bddc60e462f7",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cfdf_document.h",
      "new_id": "7298f4e1c51dc3cc497d5efd403a0a55b20f4648",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cfdf_document.h"
    },
    {
      "type": "modify",
      "old_id": "0c9251ca2332ffbf5585f1abc86c2405e97bc28e",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_array.h",
      "new_id": "c4686c08e1467daed7fe2d245c26f4107212c141",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_array.h"
    },
    {
      "type": "modify",
      "old_id": "406381b1b9611edc97abed924c840fa3e9ce6a84",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_boolean.h",
      "new_id": "5aa63afd4c1ba6d34707d2f414744dc6356b1e84",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_boolean.h"
    },
    {
      "type": "modify",
      "old_id": "100e2ae29600ad7a52a85abf0e42424efd4364ed",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_data_avail.h",
      "new_id": "4dff3ce0c9dd16babe1cee50fdc265366d16fc6b",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_data_avail.h"
    },
    {
      "type": "modify",
      "old_id": "4930e5e2e3c358dfedc64e4dbbdff7d675469903",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_dictionary.h",
      "new_id": "1876a610a220a69d0d6178fd2c18314b71b8a49a",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_dictionary.h"
    },
    {
      "type": "modify",
      "old_id": "1ef6c64c59802bcdd36f0ef279418de1d6857824",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_name.h",
      "new_id": "ee5a6ce9c8e3ddffc6edc96acce2cfaf0efd1fa3",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_name.h"
    },
    {
      "type": "modify",
      "old_id": "e2b23d44f4275e9d2b5669f425628152784296ac",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_object_avail_unittest.cpp",
      "new_id": "7dc1dcc05088e8c705b107dd862afc1f5e3ea0b7",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_object_avail_unittest.cpp"
    },
    {
      "type": "modify",
      "old_id": "b62ca4c33a00ff5eb744bed99b1eeba7f0fcb884",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_page_object_avail.h",
      "new_id": "bb9e80a66948c26e290246f06fe729ef2608fc79",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_page_object_avail.h"
    },
    {
      "type": "modify",
      "old_id": "f278b6e57c724bdcb3466dcc181421098bf187a4",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_page_object_avail_unittest.cpp",
      "new_id": "57ab09c219d1ba3d96c5ae7f28bf17701caefb5f",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_page_object_avail_unittest.cpp"
    },
    {
      "type": "modify",
      "old_id": "cb9c6ed1d4b021e81be7a903004842efaf8c57b7",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_reference.h",
      "new_id": "f7b03ac721562555d46da08f9214e816d224153a",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_reference.h"
    },
    {
      "type": "modify",
      "old_id": "9d8cf6d89696e54e56af5730d5ada08692e7c3c2",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_stream.h",
      "new_id": "aada80e35c252b892ea2c4a0d513e72b72004471",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_stream.h"
    },
    {
      "type": "modify",
      "old_id": "3c42639828b47934790954c80c511288f2301c6a",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_stream_acc.h",
      "new_id": "ddbdc6ae0fefd20fba20ef173dfcc8284abc7419",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_stream_acc.h"
    },
    {
      "type": "modify",
      "old_id": "75cc3c4fe18d3230eb5ce8c3491ee7b8a79393e6",
      "old_mode": 33188,
      "old_path": "core/fpdfapi/parser/cpdf_string.h",
      "new_id": "d3fc2c5911c1e8f09e6d9aa7e78c010072484784",
      "new_mode": 33188,
      "new_path": "core/fpdfapi/parser/cpdf_string.h"
    },
    {
      "type": "modify",
      "old_id": "c603ce192b32d9af3a7a11726cc6874196e00cf8",
      "old_mode": 33188,
      "old_path": "core/fxcodec/codec/ccodec_flatemodule.cpp",
      "new_id": "0dc1822300b15233aaa1df00e73878eb329087c2",
      "new_mode": 33188,
      "new_path": "core/fxcodec/codec/ccodec_flatemodule.cpp"
    },
    {
      "type": "modify",
      "old_id": "b93f5418f35e7754493cf9b39ffee8fe16fed10a",
      "old_mode": 33188,
      "old_path": "core/fxcodec/codec/fx_codec.cpp",
      "new_id": "d38f10aadd866b31a6e47178463eea213b2affb8",
      "new_mode": 33188,
      "new_path": "core/fxcodec/codec/fx_codec.cpp"
    },
    {
      "type": "modify",
      "old_id": "7b8230de186c43bc2844e203db0e290b8c2e2eba",
      "old_mode": 33188,
      "old_path": "core/fxcrt/cfx_fileaccess_posix.h",
      "new_id": "c759d8c1aa6c74cc17e3ee7fdefc46d1d1183cac",
      "new_mode": 33188,
      "new_path": "core/fxcrt/cfx_fileaccess_posix.h"
    },
    {
      "type": "modify",
      "old_id": "fad2ed6f945c9481eadbb5caa270297204d194c0",
      "old_mode": 33188,
      "old_path": "core/fxcrt/cfx_fileaccess_windows.h",
      "new_id": "6d58409e6556cd6f27dabb17f41548c15664955e",
      "new_mode": 33188,
      "new_path": "core/fxcrt/cfx_fileaccess_windows.h"
    },
    {
      "type": "modify",
      "old_id": "5e04c649b97be2657312e1ca9a5553be835a4dc4",
      "old_mode": 33188,
      "old_path": "core/fxcrt/css/cfx_cssvaluelist.h",
      "new_id": "4b87f4c38163f72105a6d10eb1c708ec9dbacc9b",
      "new_mode": 33188,
      "new_path": "core/fxcrt/css/cfx_cssvaluelist.h"
    },
    {
      "type": "modify",
      "old_id": "f671bfbbb7f292d5ab2ad7c4a51ef5fc095b537b",
      "old_mode": 33188,
      "old_path": "core/fxge/android/cfx_androidfontinfo.h",
      "new_id": "86b0d34d62487d18bfd4531733b9155609433416",
      "new_mode": 33188,
      "new_path": "core/fxge/android/cfx_androidfontinfo.h"
    },
    {
      "type": "modify",
      "old_id": "4b7de7d5f9c06aa5a9ade8d12f55f322dc76b8b8",
      "old_mode": 33188,
      "old_path": "core/fxge/win32/cfx_windowsdib.h",
      "new_id": "edc1ed701c82a6bdabbe1a6451230b262e4dca9e",
      "new_mode": 33188,
      "new_path": "core/fxge/win32/cfx_windowsdib.h"
    },
    {
      "type": "modify",
      "old_id": "0bc68c46b9adc2651b356c21ac88b804bdd85d25",
      "old_mode": 33188,
      "old_path": "core/fxge/win32/win32_int.h",
      "new_id": "7b4f9ab246684de56c4afb8b97d092e6900e8c70",
      "new_mode": 33188,
      "new_path": "core/fxge/win32/win32_int.h"
    },
    {
      "type": "modify",
      "old_id": "0ec8d173aebb844a12a1f263d8185a28698fb533",
      "old_mode": 33188,
      "old_path": "fpdfsdk/cpdfsdk_helpers.cpp",
      "new_id": "2d2d78adedebb63f64a2089870dba84a3fa431b5",
      "new_mode": 33188,
      "new_path": "fpdfsdk/cpdfsdk_helpers.cpp"
    },
    {
      "type": "modify",
      "old_id": "887f06d43198103c8ef486ed778e3ae906583814",
      "old_mode": 33188,
      "old_path": "fpdfsdk/fpdfxfa/cpdfxfa_context.h",
      "new_id": "1315375b586186b81c5afa9b3ed94f8dd64c29e5",
      "new_mode": 33188,
      "new_path": "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
    },
    {
      "type": "modify",
      "old_id": "769bdaa79274e25f6e47debe43ae17ff4d7918e8",
      "old_mode": 33188,
      "old_path": "fpdfsdk/fpdfxfa/cpdfxfa_page.h",
      "new_id": "90376222f46c1578b705abb8ab2a0b2b59675578",
      "new_mode": 33188,
      "new_path": "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
    },
    {
      "type": "modify",
      "old_id": "8bca0bdd28044635ed20453caebcc230acd38d6c",
      "old_mode": 33188,
      "old_path": "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h",
      "new_id": "770b0e2d9704e77e2453c1c4ca39a7e13c2024f8",
      "new_mode": 33188,
      "new_path": "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
    },
    {
      "type": "modify",
      "old_id": "0b63bf224dea13487850899ad448d6bbcab636ba",
      "old_mode": 33188,
      "old_path": "fpdfsdk/pwl/cpwl_scroll_bar.h",
      "new_id": "a61c04d01913cce6879df2da1d834443cc5c8741",
      "new_mode": 33188,
      "new_path": "fpdfsdk/pwl/cpwl_scroll_bar.h"
    },
    {
      "type": "modify",
      "old_id": "3c7ff2eba34053aa0507ecb9fbc0db5872bc8b04",
      "old_mode": 33188,
      "old_path": "fxbarcode/oned/BC_OnedEAN13Writer.h",
      "new_id": "c80091897f1514822c07bd3fe777c621fff78ee6",
      "new_mode": 33188,
      "new_path": "fxbarcode/oned/BC_OnedEAN13Writer.h"
    },
    {
      "type": "modify",
      "old_id": "269156a25e7e287902100477ae209e90df22ef25",
      "old_mode": 33188,
      "old_path": "fxbarcode/oned/BC_OnedEAN8Writer.h",
      "new_id": "853d4dace8aaeadb34a7ef88ed4d52493a59235b",
      "new_mode": 33188,
      "new_path": "fxbarcode/oned/BC_OnedEAN8Writer.h"
    },
    {
      "type": "modify",
      "old_id": "1a9f091f60570fe759787b677be4036f4b07d174",
      "old_mode": 33188,
      "old_path": "fxbarcode/oned/BC_OnedUPCAWriter.h",
      "new_id": "6101b4d8d17c2fdae04a9829831574aef9f00103",
      "new_mode": 33188,
      "new_path": "fxbarcode/oned/BC_OnedUPCAWriter.h"
    },
    {
      "type": "modify",
      "old_id": "cc327447366052b6e91ebf5858c54287a6781c2e",
      "old_mode": 33188,
      "old_path": "fxjs/cjs_runtimestub.h",
      "new_id": "779a67579eeefa1effda86f087cf44325df0e051",
      "new_mode": 33188,
      "new_path": "fxjs/cjs_runtimestub.h"
    },
    {
      "type": "modify",
      "old_id": "31ce1e205d46d99c52a2ecdff12f4cc3ad2016a7",
      "old_mode": 33188,
      "old_path": "testing/embedder_test_timer_handling_delegate.h",
      "new_id": "34b4cbb551e7b7bd9913731c31f1f1864ff3c3bc",
      "new_mode": 33188,
      "new_path": "testing/embedder_test_timer_handling_delegate.h"
    },
    {
      "type": "modify",
      "old_id": "a71afc935f0450cba14f282363da808e9bf1f8bb",
      "old_mode": 33188,
      "old_path": "xfa/fwl/theme/cfwl_carettp.h",
      "new_id": "2fe01bed1a64b80a30057d61ac43c57ee842ff71",
      "new_mode": 33188,
      "new_path": "xfa/fwl/theme/cfwl_carettp.h"
    },
    {
      "type": "modify",
      "old_id": "fa06c7ec0ec528a9c97269058c97234f80f8cb24",
      "old_mode": 33188,
      "old_path": "xfa/fwl/theme/cfwl_checkboxtp.h",
      "new_id": "506f78413a71606068b7e47540f4fe4520d1f741",
      "new_mode": 33188,
      "new_path": "xfa/fwl/theme/cfwl_checkboxtp.h"
    },
    {
      "type": "modify",
      "old_id": "dd8311c8a1adbd1b29f9dcc639602d29c18170b2",
      "old_mode": 33188,
      "old_path": "xfa/fwl/theme/cfwl_comboboxtp.h",
      "new_id": "1456143e431710b41ee8f2ba8e0c259d785dfca7",
      "new_mode": 33188,
      "new_path": "xfa/fwl/theme/cfwl_comboboxtp.h"
    },
    {
      "type": "modify",
      "old_id": "5a548511cff4d182ccd1505c993b600814eb3025",
      "old_mode": 33188,
      "old_path": "xfa/fwl/theme/cfwl_datetimepickertp.h",
      "new_id": "e7a7239e8d406950ffb6e8d8984fa6feac94946b",
      "new_mode": 33188,
      "new_path": "xfa/fwl/theme/cfwl_datetimepickertp.h"
    },
    {
      "type": "modify",
      "old_id": "95ce01c441dbfa50130e1b0600338edef5bcd7f0",
      "old_mode": 33188,
      "old_path": "xfa/fwl/theme/cfwl_listboxtp.h",
      "new_id": "e87ac6f0629b4dad47befc11800100ec04d6de99",
      "new_mode": 33188,
      "new_path": "xfa/fwl/theme/cfwl_listboxtp.h"
    },
    {
      "type": "modify",
      "old_id": "95e2a190b713edd7579d77beb8368ebc05c5fca6",
      "old_mode": 33188,
      "old_path": "xfa/fwl/theme/cfwl_monthcalendartp.h",
      "new_id": "4dd08b49c34b88a5402d8e4be8383db4428d4e17",
      "new_mode": 33188,
      "new_path": "xfa/fwl/theme/cfwl_monthcalendartp.h"
    },
    {
      "type": "modify",
      "old_id": "2e1782a1b5dc285e78e9b621451a0170a83313e4",
      "old_mode": 33188,
      "old_path": "xfa/fwl/theme/cfwl_pushbuttontp.h",
      "new_id": "6b49ba64799771f8510c21eff63290bcad0c6cba",
      "new_mode": 33188,
      "new_path": "xfa/fwl/theme/cfwl_pushbuttontp.h"
    },
    {
      "type": "modify",
      "old_id": "53cbb38d8325a2c69ac6706c11f78943f3fca7f0",
      "old_mode": 33188,
      "old_path": "xfa/fwl/theme/cfwl_scrollbartp.h",
      "new_id": "2a202e1b1e9f967b09e764d70549bc6725d6be57",
      "new_mode": 33188,
      "new_path": "xfa/fwl/theme/cfwl_scrollbartp.h"
    },
    {
      "type": "modify",
      "old_id": "a745b0639bf7f1591fc4e1512a2e6b197e4ec79b",
      "old_mode": 33188,
      "old_path": "xfa/fxfa/cxfa_ffpageview.h",
      "new_id": "16477fa2d39c0d650d8145ac97804df08ca1d952",
      "new_mode": 33188,
      "new_path": "xfa/fxfa/cxfa_ffpageview.h"
    }
  ]
}