Revert https://codereview.chromium.org/1291903002 (protobuf roll).

third_party/protobuf/protobuf_nacl.gyp

Index: third_party/protobuf/protobuf_nacl.gyp
diff --git a/third_party/protobuf/protobuf_nacl.gyp b/third_party/protobuf/protobuf_nacl.gyp
index 4b63e5c10a9202f71a7701cfb88f1b056f3ecd8c..ae37f2f01502d0d699357c10bf1dd1c235d6a69f 100644
--- a/third_party/protobuf/protobuf_nacl.gyp
+++ b/third_party/protobuf/protobuf_nacl.gyp
@@ -11,15 +11,23 @@
       'target_name': 'protobuf_lite_nacl',
       'type': 'none',
       'variables': {
-        'nacl_untrusted_build': 1,
         'nlib_target': 'libprotobuf_lite_nacl.a',
         'build_glibc': 0,
         'build_newlib': 0,
         'build_pnacl_newlib': 1,
+        'config_h_dir': '.',
       },
+      'pnacl_compile_flags': [
+        # This disables #warning in hash_map/hash_set headers which are
+        # deprecated but still used in protobuf.
+        #
+        # TODO(sergeyu): Migrate protobuf to unordered_man and unordered_set
+        # and remove this flag.
+        '-Wno-#warnings',
+      ],
       'includes': [
         'protobuf_lite.gypi',
       ],
-    },
+    },  # end of target 'protobuf_lite_nacl'
   ]
 }