Remove unused test fields from VbNvStorage

Confirmed via codesearch that these fields are not used outside of
vboot_reference itself, and the only use inside vboot_reference is one
test which checked that the test error generation itself worked.

BUG=chromium-os:31668
TEST=make && make runtests

Signed-off-by: Randall Spangler <rspangler@chromium.org>
Change-Id: Ic393e126ca2853f7aaff19ffd6fcdbdb1c47689f
Reviewed-on: https://gerrit.chromium.org/gerrit/24895
Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c
index a834979..d80f843 100644
--- a/host/lib/crossystem.c
+++ b/host/lib/crossystem.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -363,10 +363,6 @@
     value = VbGetNvStorage(VBNV_KERNEL_FIELD);
   } else if (!strcasecmp(name,"nvram_cleared")) {
     value = VbGetNvStorage(VBNV_KERNEL_SETTINGS_RESET);
-  } else if (!strcasecmp(name,"vbtest_errfunc")) {
-    value = VbGetNvStorage(VBNV_TEST_ERROR_FUNC);
-  } else if (!strcasecmp(name,"vbtest_errno")) {
-    value = VbGetNvStorage(VBNV_TEST_ERROR_NUM);
   } else if (!strcasecmp(name,"recovery_request")) {
     value = VbGetNvStorage(VBNV_RECOVERY_REQUEST);
   } else if (!strcasecmp(name,"dbg_reset")) {
@@ -443,10 +439,6 @@
   if (!strcasecmp(name,"nvram_cleared")) {
     /* Can only clear this flag; it's set inside the NV storage library. */
     return VbSetNvStorage(VBNV_KERNEL_SETTINGS_RESET, 0);
-  } else if (!strcasecmp(name,"vbtest_errfunc")) {
-    return VbSetNvStorage(VBNV_TEST_ERROR_FUNC, value);
-  } else if (!strcasecmp(name,"vbtest_errno")) {
-    return VbSetNvStorage(VBNV_TEST_ERROR_NUM, value);
   } else if (!strcasecmp(name,"recovery_request")) {
     return VbSetNvStorage(VBNV_RECOVERY_REQUEST, value);
   } else if (!strcasecmp(name,"dbg_reset")) {