Revert of Do a better job at faking simple challenge signatures.

chromeos/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/ui.gni")
 import("//testing/test.gni")
 import("//third_party/protobuf/proto_library.gni")
 
 assert(is_chromeos, "Non-ChromeOS builds must not depend on //chromeos")
 
 declare_args() {
   # Use binder. Binder related code is compiled only when true.
   use_binder = false
 }
 
 gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ rebase_path("chromeos.gyp") ],
                           "scope",
                           [ "chromeos.gyp" ])
 
 component("chromeos") {
   configs += [ "//third_party/nss:system_nss_no_ssl_config" ]
   public_deps = [
     "//dbus",
   ]
   deps = [
-    ":attestation_proto",
     ":cryptohome_proto",
     ":power_manager_proto",
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//components/device_event_log",
     "//components/onc",
     "//components/policy/proto",
     "//components/prefs",
     "//components/proxy_config",
@@ skipping 17 matching lines @@
 
 # This must be a static library instead of a source set because some of the
 # files pull in things with dependencies that aren't linked in all cases.
 #
 # TODO this should probably be changed such that it links in all cases and
 # can be converted to a source set.
 static_library("test_support") {
   testonly = true
   configs += [ "//build/config/linux/dbus" ]
   public_deps = [
-    ":attestation_proto",
     ":chromeos",
     ":cryptohome_proto",
     ":power_manager_proto",
   ]
   deps = [
     ":test_support_without_gmock",
     "//components/signin/core/account_id",
     "//dbus:test_support",
     "//google_apis",
     "//net:test_support",
@@ skipping 43 matching lines @@
     "network/mock_network_device_handler.h",
     "network/onc/onc_test_utils.cc",
     "network/onc/onc_test_utils.h",
   ]
 }
 
 static_library("test_support_without_gmock") {
   testonly = true
   configs += [ "//build/config/linux/dbus" ]
   deps = [
-    ":attestation_proto",
     ":chromeos",
     ":cryptohome_proto",
     ":power_manager_proto",
     "//crypto",
   ]
   sources = [
     "dbus/fake_cros_disks_client.cc",
     "dbus/fake_cros_disks_client.h",
     "dbus/fake_session_manager_client.cc",
     "dbus/fake_session_manager_client.h",
     "dbus/fake_shill_manager_client.cc",
     "dbus/fake_shill_manager_client.h",
     "dbus/fake_update_engine_client.cc",
     "dbus/fake_update_engine_client.h",
   ]
 }
 
 test("chromeos_unittests") {
   configs += [
     "//build/config/linux/dbus",
     "//third_party/nss:system_nss_no_ssl_config",
   ]
   deps = [
-    ":attestation_proto",
     ":cryptohome_proto",
     ":power_manager_proto",
     ":test_support",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//components/onc",
     "//components/prefs:test_support",
     "//components/proxy_config",
     "//components/signin/core/account_id",
     "//crypto",
@@ skipping 34 matching lines @@
 
 proto_library("cryptohome_proto") {
   sources = [
     "//third_party/cros_system_api/dbus/cryptohome/key.proto",
     "//third_party/cros_system_api/dbus/cryptohome/rpc.proto",
   ]
 
   proto_out_dir = "chromeos/dbus/cryptohome"
 }
 
-proto_library("attestation_proto") {
-  sources = [
-    "dbus/proto/attestation.proto",
-  ]
-
-  proto_out_dir = "chromeos/attestation"
-}
-
 proto_library("cryptohome_signkey_proto") {
   sources = [
     "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto",
   ]
 
   proto_out_dir = "chromeos/cryptohome"
 }