Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

components/policy/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/toolchain/toolchain.gni")
 import("//components/policy/resources/policy_templates.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 174 matching lines @@
   }
 }
 
 # Run the proto compiler over the generated file and make it a component.
 component("cloud_policy_proto_generated_compile") {
   public_deps = [
     ":cloud_policy_proto_generated_compile_proto",
   ]
 }
 proto_library("cloud_policy_proto_generated_compile_proto") {
-  visibility = [
-    ":cloud_policy_proto_generated_compile",
-    ":chrome_settings_proto_generated_compile",
-  ]
+  visibility = [ ":cloud_policy_proto_generated_compile" ]
   sources = [
     cloud_policy_proto_path,
   ]
 
   proto_out_dir = "components/policy/proto"
   cc_generator_options = "dllexport_decl=POLICY_PROTO_EXPORT:"
   cc_include = "components/policy/proto/policy_proto_export.h"
   component_build_force_source_set = true
   defines = [ "POLICY_PROTO_COMPILATION" ]
 
   deps = [
     ":cloud_policy_code_generate",
   ]
 }
 
 # This target builds the "full" protobuf, used for tests only.
-component("chrome_settings_proto_generated_compile") {
+proto_library("chrome_settings_proto") {
   testonly = true
-  public_deps = [
-    ":chrome_settings_proto_generated_compile_proto",
-    ":cloud_policy_proto_generated_compile_proto",
-  ]
-}
-proto_library("chrome_settings_proto_generated_compile_proto") {
-  testonly = true
-  visibility = [ ":chrome_settings_proto_generated_compile" ]
   sources = [
     chrome_settings_proto_path,
   ]
-
   proto_out_dir = "components/policy/proto"
-  cc_generator_options = "dllexport_decl=POLICY_PROTO_EXPORT:"
-  cc_include = "components/policy/proto/policy_proto_export.h"
-  component_build_force_source_set = true
-  defines = [ "POLICY_PROTO_COMPILATION" ]
 
   deps = [
     ":cloud_policy_code_generate",
+    ":cloud_policy_proto_generated_compile",
   ]
 }
 
 static_library("generated") {
   sources = [
     constants_header_path,
     constants_source_path,
     protobuf_decoder_path,
     risk_tag_header_path,
   ]
@@ skipping 152 matching lines @@
            ] + grit_defines
     if (is_chrome_branded) {
       args += [ "--include_google_admx" ]
     }
     deps = [
       ":add_version",
       ":policy_templates",
     ]
   }
 }