Protobuf: Move thread-local global data to globals.cc

third_party/protobuf/BUILD.gn

Index: third_party/protobuf/BUILD.gn
diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn
index 6fb6d6ad30439ccee3fb4dcac22cec4b90c454f0..829cfdfe9e4df181620c038c5ce8bdde417e890e 100644
--- a/third_party/protobuf/BUILD.gn
+++ b/third_party/protobuf/BUILD.gn
@@ -203,9 +203,11 @@ target(link_target_type, "protobuf_lite") {
   }
 
   # Required for component builds. See http://crbug.com/172800.
-  if (is_component_build && (!is_linux || is_chromeos)) {
+  if (is_component_build) {
     public_configs += [ ":protobuf_use_dlls" ]

[Peter Kasting, 2017/03/22 05:16:40]

Dunno that I understand the change to start doing this for Linux

[Tom (Use chromium acct), 2017/03/22 05:40:49]

cr_thread_cache() has a different definition depending on
defined(USE_PROTOBUF_DLLS), and this makes it so that protobuf_lite and
protobuf_globals are using the same one.

-    defines = [ "LIBPROTOBUF_EXPORTS" ]
+    if (!is_linux || is_chromeos) {
+      defines = [ "LIBPROTOBUF_EXPORTS" ]
+    }
   }
 }