97 files changed, 6 insertions, 4 deletions
diff --git a/libs/moz.build b/libs/moz.build
index 5cebcec2b..28bb949e5 100644
--- a/libs/moz.build
+++ b/libs/moz.build
@@ -85,3 +85,6 @@ DIRS += ['snappy']
 
 # parser
 DIRS += ['expat']
+
+# toolkit
+DIRS += ['protobuf']
diff --git a/toolkit/components/protobuf/COPYING.txt b/libs/protobuf/COPYING.txt
index 705db579c..705db579c 100644
--- a/toolkit/components/protobuf/COPYING.txt
+++ b/libs/protobuf/COPYING.txt
diff --git a/toolkit/components/protobuf/README.txt b/libs/protobuf/README.txt
index c63704ac5..c63704ac5 100644
--- a/toolkit/components/protobuf/README.txt
+++ b/libs/protobuf/README.txt
diff --git a/toolkit/components/protobuf/m-c-changes.patch b/libs/protobuf/m-c-changes.patch
index d09e7c5a8..d09e7c5a8 100644
--- a/toolkit/components/protobuf/m-c-changes.patch
+++ b/libs/protobuf/m-c-changes.patch
diff --git a/toolkit/components/protobuf/moz.build b/libs/protobuf/moz.build
index 7d1f9804d..4f4705efd 100644
--- a/toolkit/components/protobuf/moz.build
+++ b/libs/protobuf/moz.build
@@ -111,6 +111,7 @@ ALLOW_COMPILER_WARNINGS = True
 FINAL_LIBRARY = 'xul'
 
 DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
+DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
 
 # Suppress warnings in third-party code.
 if CONFIG['GNU_CXX']:
diff --git a/toolkit/components/protobuf/src/google/protobuf/descriptor.cc b/libs/protobuf/src/google/protobuf/descriptor.cc
index 21dda5987..21dda5987 100644
--- a/toolkit/components/protobuf/src/google/protobuf/descriptor.cc
+++ b/libs/protobuf/src/google/protobuf/descriptor.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/descriptor.h b/libs/protobuf/src/google/protobuf/descriptor.h
index 67afc774d..67afc774d 100644
--- a/toolkit/components/protobuf/src/google/protobuf/descriptor.h
+++ b/libs/protobuf/src/google/protobuf/descriptor.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/descriptor.pb.cc b/libs/protobuf/src/google/protobuf/descriptor.pb.cc
index c3aa2fb68..c3aa2fb68 100644
--- a/toolkit/components/protobuf/src/google/protobuf/descriptor.pb.cc
+++ b/libs/protobuf/src/google/protobuf/descriptor.pb.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/descriptor.pb.h b/libs/protobuf/src/google/protobuf/descriptor.pb.h
index 45521812c..45521812c 100644
--- a/toolkit/components/protobuf/src/google/protobuf/descriptor.pb.h
+++ b/libs/protobuf/src/google/protobuf/descriptor.pb.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/descriptor.proto b/libs/protobuf/src/google/protobuf/descriptor.proto
index a753601f3..a753601f3 100644
--- a/toolkit/components/protobuf/src/google/protobuf/descriptor.proto
+++ b/libs/protobuf/src/google/protobuf/descriptor.proto
diff --git a/toolkit/components/protobuf/src/google/protobuf/descriptor_database.cc b/libs/protobuf/src/google/protobuf/descriptor_database.cc
index d024eab13..d024eab13 100644
--- a/toolkit/components/protobuf/src/google/protobuf/descriptor_database.cc
+++ b/libs/protobuf/src/google/protobuf/descriptor_database.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/descriptor_database.h b/libs/protobuf/src/google/protobuf/descriptor_database.h
index 934e4022b..934e4022b 100644
--- a/toolkit/components/protobuf/src/google/protobuf/descriptor_database.h
+++ b/libs/protobuf/src/google/protobuf/descriptor_database.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/dynamic_message.cc b/libs/protobuf/src/google/protobuf/dynamic_message.cc
index 4cca98691..4cca98691 100644
--- a/toolkit/components/protobuf/src/google/protobuf/dynamic_message.cc
+++ b/libs/protobuf/src/google/protobuf/dynamic_message.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/dynamic_message.h b/libs/protobuf/src/google/protobuf/dynamic_message.h
index 10ed70051..10ed70051 100644
--- a/toolkit/components/protobuf/src/google/protobuf/dynamic_message.h
+++ b/libs/protobuf/src/google/protobuf/dynamic_message.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/extension_set.cc b/libs/protobuf/src/google/protobuf/extension_set.cc
index 274554b5f..274554b5f 100644
--- a/toolkit/components/protobuf/src/google/protobuf/extension_set.cc
+++ b/libs/protobuf/src/google/protobuf/extension_set.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/extension_set.h b/libs/protobuf/src/google/protobuf/extension_set.h
index d7ec51924..d7ec51924 100644
--- a/toolkit/components/protobuf/src/google/protobuf/extension_set.h
+++ b/libs/protobuf/src/google/protobuf/extension_set.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/extension_set_heavy.cc b/libs/protobuf/src/google/protobuf/extension_set_heavy.cc
index eae4d574f..eae4d574f 100644
--- a/toolkit/components/protobuf/src/google/protobuf/extension_set_heavy.cc
+++ b/libs/protobuf/src/google/protobuf/extension_set_heavy.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/generated_enum_reflection.h b/libs/protobuf/src/google/protobuf/generated_enum_reflection.h
index 3852cea58..3852cea58 100644
--- a/toolkit/components/protobuf/src/google/protobuf/generated_enum_reflection.h
+++ b/libs/protobuf/src/google/protobuf/generated_enum_reflection.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/generated_message_reflection.cc b/libs/protobuf/src/google/protobuf/generated_message_reflection.cc
index 536de7d92..536de7d92 100644
--- a/toolkit/components/protobuf/src/google/protobuf/generated_message_reflection.cc
+++ b/libs/protobuf/src/google/protobuf/generated_message_reflection.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/generated_message_reflection.h b/libs/protobuf/src/google/protobuf/generated_message_reflection.h
index b6671ad06..b6671ad06 100644
--- a/toolkit/components/protobuf/src/google/protobuf/generated_message_reflection.h
+++ b/libs/protobuf/src/google/protobuf/generated_message_reflection.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/generated_message_util.cc b/libs/protobuf/src/google/protobuf/generated_message_util.cc
index 0c20d81c8..0c20d81c8 100644
--- a/toolkit/components/protobuf/src/google/protobuf/generated_message_util.cc
+++ b/libs/protobuf/src/google/protobuf/generated_message_util.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/generated_message_util.h b/libs/protobuf/src/google/protobuf/generated_message_util.h
index 678f92a7e..678f92a7e 100644
--- a/toolkit/components/protobuf/src/google/protobuf/generated_message_util.h
+++ b/libs/protobuf/src/google/protobuf/generated_message_util.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/coded_stream.cc b/libs/protobuf/src/google/protobuf/io/coded_stream.cc
index 53449755c..53449755c 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/coded_stream.cc
+++ b/libs/protobuf/src/google/protobuf/io/coded_stream.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/coded_stream.h b/libs/protobuf/src/google/protobuf/io/coded_stream.h
index 81fabb1d8..81fabb1d8 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/coded_stream.h
+++ b/libs/protobuf/src/google/protobuf/io/coded_stream.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/coded_stream_inl.h b/libs/protobuf/src/google/protobuf/io/coded_stream_inl.h
index 88c14cab4..88c14cab4 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/coded_stream_inl.h
+++ b/libs/protobuf/src/google/protobuf/io/coded_stream_inl.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/gzip_stream.cc b/libs/protobuf/src/google/protobuf/io/gzip_stream.cc
index 6e4054eda..6e4054eda 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/gzip_stream.cc
+++ b/libs/protobuf/src/google/protobuf/io/gzip_stream.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/gzip_stream.h b/libs/protobuf/src/google/protobuf/io/gzip_stream.h
index c7ccc260d..c7ccc260d 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/gzip_stream.h
+++ b/libs/protobuf/src/google/protobuf/io/gzip_stream.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/package_info.h b/libs/protobuf/src/google/protobuf/io/package_info.h
index dc1fc91e5..dc1fc91e5 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/package_info.h
+++ b/libs/protobuf/src/google/protobuf/io/package_info.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/printer.cc b/libs/protobuf/src/google/protobuf/io/printer.cc
index c8df41778..c8df41778 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/printer.cc
+++ b/libs/protobuf/src/google/protobuf/io/printer.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/printer.h b/libs/protobuf/src/google/protobuf/io/printer.h
index f06cbf2f0..f06cbf2f0 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/printer.h
+++ b/libs/protobuf/src/google/protobuf/io/printer.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/strtod.cc b/libs/protobuf/src/google/protobuf/io/strtod.cc
index 56973439d..56973439d 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/strtod.cc
+++ b/libs/protobuf/src/google/protobuf/io/strtod.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/strtod.h b/libs/protobuf/src/google/protobuf/io/strtod.h
index c2efc8d3e..c2efc8d3e 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/strtod.h
+++ b/libs/protobuf/src/google/protobuf/io/strtod.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/tokenizer.cc b/libs/protobuf/src/google/protobuf/io/tokenizer.cc
index ef2de300b..ef2de300b 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/tokenizer.cc
+++ b/libs/protobuf/src/google/protobuf/io/tokenizer.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/tokenizer.h b/libs/protobuf/src/google/protobuf/io/tokenizer.h
index 8c6220a1d..8c6220a1d 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/tokenizer.h
+++ b/libs/protobuf/src/google/protobuf/io/tokenizer.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream.cc b/libs/protobuf/src/google/protobuf/io/zero_copy_stream.cc
index f77c768fc..f77c768fc 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream.cc
+++ b/libs/protobuf/src/google/protobuf/io/zero_copy_stream.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream.h b/libs/protobuf/src/google/protobuf/io/zero_copy_stream.h
index 52650fc66..52650fc66 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream.h
+++ b/libs/protobuf/src/google/protobuf/io/zero_copy_stream.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl.cc b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl.cc
index f7901b279..f7901b279 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl.cc
+++ b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h
index 0746fa6af..0746fa6af 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h
+++ b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
index 58aff0e25..58aff0e25 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
+++ b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h
index 44c6e7727..44c6e7727 100644
--- a/toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h
+++ b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/message.cc b/libs/protobuf/src/google/protobuf/message.cc
index 1324ed9b1..1324ed9b1 100644
--- a/toolkit/components/protobuf/src/google/protobuf/message.cc
+++ b/libs/protobuf/src/google/protobuf/message.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/message.h b/libs/protobuf/src/google/protobuf/message.h
index 959356053..959356053 100644
--- a/toolkit/components/protobuf/src/google/protobuf/message.h
+++ b/libs/protobuf/src/google/protobuf/message.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/message_lite.cc b/libs/protobuf/src/google/protobuf/message_lite.cc
index 14cdc91fd..14cdc91fd 100644
--- a/toolkit/components/protobuf/src/google/protobuf/message_lite.cc
+++ b/libs/protobuf/src/google/protobuf/message_lite.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/message_lite.h b/libs/protobuf/src/google/protobuf/message_lite.h
index 027cabf91..027cabf91 100644
--- a/toolkit/components/protobuf/src/google/protobuf/message_lite.h
+++ b/libs/protobuf/src/google/protobuf/message_lite.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/package_info.h b/libs/protobuf/src/google/protobuf/package_info.h
index 935e96396..935e96396 100644
--- a/toolkit/components/protobuf/src/google/protobuf/package_info.h
+++ b/libs/protobuf/src/google/protobuf/package_info.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/reflection_ops.cc b/libs/protobuf/src/google/protobuf/reflection_ops.cc
index 4629dec25..4629dec25 100644
--- a/toolkit/components/protobuf/src/google/protobuf/reflection_ops.cc
+++ b/libs/protobuf/src/google/protobuf/reflection_ops.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/reflection_ops.h b/libs/protobuf/src/google/protobuf/reflection_ops.h
index 4775911e8..4775911e8 100644
--- a/toolkit/components/protobuf/src/google/protobuf/reflection_ops.h
+++ b/libs/protobuf/src/google/protobuf/reflection_ops.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/repeated_field.cc b/libs/protobuf/src/google/protobuf/repeated_field.cc
index b400732fe..b400732fe 100644
--- a/toolkit/components/protobuf/src/google/protobuf/repeated_field.cc
+++ b/libs/protobuf/src/google/protobuf/repeated_field.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/repeated_field.h b/libs/protobuf/src/google/protobuf/repeated_field.h
index 50051831d..50051831d 100644
--- a/toolkit/components/protobuf/src/google/protobuf/repeated_field.h
+++ b/libs/protobuf/src/google/protobuf/repeated_field.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/service.cc b/libs/protobuf/src/google/protobuf/service.cc
index ffa919daa..ffa919daa 100644
--- a/toolkit/components/protobuf/src/google/protobuf/service.cc
+++ b/libs/protobuf/src/google/protobuf/service.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/service.h b/libs/protobuf/src/google/protobuf/service.h
index cc0b45d41..cc0b45d41 100644
--- a/toolkit/components/protobuf/src/google/protobuf/service.h
+++ b/libs/protobuf/src/google/protobuf/service.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h b/libs/protobuf/src/google/protobuf/stubs/atomicops.h
index e6da1fce2..e6da1fce2 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_arm64_gcc.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_arm64_gcc.h
index 0a2d2b894..0a2d2b894 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_arm64_gcc.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_arm64_gcc.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h
index 90e727b0b..90e727b0b 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_qnx.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_qnx.h
index 17dfaa518..17dfaa518 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_qnx.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_qnx.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
index eb198ff5c..eb198ff5c 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
index dd7abf6f1..dd7abf6f1 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_macosx.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_macosx.h
index 796332417..796332417 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_macosx.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_macosx.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h
index e3cd14cf8..e3cd14cf8 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_pnacl.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_pnacl.h
index b10ac02c4..b10ac02c4 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_pnacl.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_pnacl.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_solaris.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_solaris.h
index d8057ecde..d8057ecde 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_solaris.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_solaris.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_tsan.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_tsan.h
index 0c903545c..0c903545c 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_tsan.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_tsan.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
index 53c9eae0f..53c9eae0f 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.h
index edccc59de..edccc59de 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
index 741b164f0..741b164f0 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h
index e53a641f0..e53a641f0 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h
+++ b/libs/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/common.cc b/libs/protobuf/src/google/protobuf/stubs/common.cc
index 899585996..899585996 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/common.cc
+++ b/libs/protobuf/src/google/protobuf/stubs/common.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/common.h b/libs/protobuf/src/google/protobuf/stubs/common.h
index fa6fe3ce9..fa6fe3ce9 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/common.h
+++ b/libs/protobuf/src/google/protobuf/stubs/common.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/hash.h b/libs/protobuf/src/google/protobuf/stubs/hash.h
index 3640b8982..3640b8982 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/hash.h
+++ b/libs/protobuf/src/google/protobuf/stubs/hash.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/map_util.h b/libs/protobuf/src/google/protobuf/stubs/map_util.h
index 7495cb6ae..7495cb6ae 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/map_util.h
+++ b/libs/protobuf/src/google/protobuf/stubs/map_util.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/once.cc b/libs/protobuf/src/google/protobuf/stubs/once.cc
index 889c64766..889c64766 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/once.cc
+++ b/libs/protobuf/src/google/protobuf/stubs/once.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/once.h b/libs/protobuf/src/google/protobuf/stubs/once.h
index cc62bbaab..cc62bbaab 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/once.h
+++ b/libs/protobuf/src/google/protobuf/stubs/once.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h b/libs/protobuf/src/google/protobuf/stubs/platform_macros.h
index b05f2f853..b05f2f853 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h
+++ b/libs/protobuf/src/google/protobuf/stubs/platform_macros.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/shared_ptr.h b/libs/protobuf/src/google/protobuf/stubs/shared_ptr.h
index d250bf4d3..d250bf4d3 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/shared_ptr.h
+++ b/libs/protobuf/src/google/protobuf/stubs/shared_ptr.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/stl_util.h b/libs/protobuf/src/google/protobuf/stubs/stl_util.h
index 9e4c82a4c..9e4c82a4c 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/stl_util.h
+++ b/libs/protobuf/src/google/protobuf/stubs/stl_util.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/stringprintf.cc b/libs/protobuf/src/google/protobuf/stubs/stringprintf.cc
index 83fdfe454..83fdfe454 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/stringprintf.cc
+++ b/libs/protobuf/src/google/protobuf/stubs/stringprintf.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/stringprintf.h b/libs/protobuf/src/google/protobuf/stubs/stringprintf.h
index ab1ab5583..ab1ab5583 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/stringprintf.h
+++ b/libs/protobuf/src/google/protobuf/stubs/stringprintf.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/structurally_valid.cc b/libs/protobuf/src/google/protobuf/stubs/structurally_valid.cc
index 0f6afe6dc..0f6afe6dc 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/structurally_valid.cc
+++ b/libs/protobuf/src/google/protobuf/stubs/structurally_valid.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/strutil.cc b/libs/protobuf/src/google/protobuf/stubs/strutil.cc
index d7f673d10..d7f673d10 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/strutil.cc
+++ b/libs/protobuf/src/google/protobuf/stubs/strutil.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/strutil.h b/libs/protobuf/src/google/protobuf/stubs/strutil.h
index 6cf23821e..6cf23821e 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/strutil.h
+++ b/libs/protobuf/src/google/protobuf/stubs/strutil.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/substitute.cc b/libs/protobuf/src/google/protobuf/stubs/substitute.cc
index c9d95899f..c9d95899f 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/substitute.cc
+++ b/libs/protobuf/src/google/protobuf/stubs/substitute.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/substitute.h b/libs/protobuf/src/google/protobuf/stubs/substitute.h
index 7ee442af7..7ee442af7 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/substitute.h
+++ b/libs/protobuf/src/google/protobuf/stubs/substitute.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/template_util.h b/libs/protobuf/src/google/protobuf/stubs/template_util.h
index 4f30ffa3b..4f30ffa3b 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/template_util.h
+++ b/libs/protobuf/src/google/protobuf/stubs/template_util.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/type_traits.h b/libs/protobuf/src/google/protobuf/stubs/type_traits.h
index 0ef166b7a..0ef166b7a 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/type_traits.h
+++ b/libs/protobuf/src/google/protobuf/stubs/type_traits.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/text_format.cc b/libs/protobuf/src/google/protobuf/text_format.cc
index 84cdbb57e..84cdbb57e 100644
--- a/toolkit/components/protobuf/src/google/protobuf/text_format.cc
+++ b/libs/protobuf/src/google/protobuf/text_format.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/text_format.h b/libs/protobuf/src/google/protobuf/text_format.h
index 295494108..295494108 100644
--- a/toolkit/components/protobuf/src/google/protobuf/text_format.h
+++ b/libs/protobuf/src/google/protobuf/text_format.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/unknown_field_set.cc b/libs/protobuf/src/google/protobuf/unknown_field_set.cc
index 020a323b3..020a323b3 100644
--- a/toolkit/components/protobuf/src/google/protobuf/unknown_field_set.cc
+++ b/libs/protobuf/src/google/protobuf/unknown_field_set.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/unknown_field_set.h b/libs/protobuf/src/google/protobuf/unknown_field_set.h
index ba202eb68..ba202eb68 100644
--- a/toolkit/components/protobuf/src/google/protobuf/unknown_field_set.h
+++ b/libs/protobuf/src/google/protobuf/unknown_field_set.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/wire_format.cc b/libs/protobuf/src/google/protobuf/wire_format.cc
index fc6210c28..fc6210c28 100644
--- a/toolkit/components/protobuf/src/google/protobuf/wire_format.cc
+++ b/libs/protobuf/src/google/protobuf/wire_format.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/wire_format.h b/libs/protobuf/src/google/protobuf/wire_format.h
index 9f26eb29b..9f26eb29b 100644
--- a/toolkit/components/protobuf/src/google/protobuf/wire_format.h
+++ b/libs/protobuf/src/google/protobuf/wire_format.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/wire_format_lite.cc b/libs/protobuf/src/google/protobuf/wire_format_lite.cc
index 8de827849..8de827849 100644
--- a/toolkit/components/protobuf/src/google/protobuf/wire_format_lite.cc
+++ b/libs/protobuf/src/google/protobuf/wire_format_lite.cc
diff --git a/toolkit/components/protobuf/src/google/protobuf/wire_format_lite.h b/libs/protobuf/src/google/protobuf/wire_format_lite.h
index 14b3feb6a..14b3feb6a 100644
--- a/toolkit/components/protobuf/src/google/protobuf/wire_format_lite.h
+++ b/libs/protobuf/src/google/protobuf/wire_format_lite.h
diff --git a/toolkit/components/protobuf/src/google/protobuf/wire_format_lite_inl.h b/libs/protobuf/src/google/protobuf/wire_format_lite_inl.h
index feb225404..feb225404 100644
--- a/toolkit/components/protobuf/src/google/protobuf/wire_format_lite_inl.h
+++ b/libs/protobuf/src/google/protobuf/wire_format_lite_inl.h
diff --git a/toolkit/components/protobuf/upgrade_protobuf.sh b/libs/protobuf/upgrade_protobuf.sh
index bdaa4ce63..bdaa4ce63 100755
--- a/toolkit/components/protobuf/upgrade_protobuf.sh
+++ b/libs/protobuf/upgrade_protobuf.sh
diff --git a/toolkit/components/build/moz.build b/toolkit/components/build/moz.build
index 10088684f..828fd8056 100644
--- a/toolkit/components/build/moz.build
+++ b/toolkit/components/build/moz.build
@@ -21,7 +21,6 @@ LOCAL_INCLUDES += [
     '../find',
     '../jsdownloads/src',
     '../perfmonitoring',
-    '../protobuf',
     '../startup',
     '../statusfilter',
     '../typeaheadfind'
diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
index e4ed6bced..b88869afa 100644
--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
@@ -34,8 +34,8 @@ if not CONFIG['MOZ_SUITE'] and not CONFIG['BINOC_COMM_DLMGR']:
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../protobuf',
-    '/ipc/chromium/src'
+    '/ipc/chromium/src',
+    '/libs/protobuf',
 ]
 
 DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 22f5aa863..79a32f063 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -44,7 +44,6 @@ DIRS += [
     'processsingleton',
     'promiseworker',
     'prompts',
-    'protobuf',
     'reader',
     'remotebrowserutils',
     'reflect',