Revert of network_time_tracker: add temporary time protocol.

components/client_update_protocol/ecdsa_unittest.cc

 // Copyright 2016 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.
 
 #include "components/client_update_protocol/ecdsa.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <memory>
@@ skipping 28 matching lines @@
 
 }  // end namespace
 
 class CupEcdsaTest : public testing::Test {
  protected:
   void SetUp() override {
     cup_ = Ecdsa::Create(8, GetPublicKeyForTesting());
     ASSERT_TRUE(cup_.get());
   }
 
+  void OverrideNonce(uint32_t nonce) {
+    cup_->request_query_cup2key_ =
+        base::StringPrintf("%d:%u", cup_->pub_key_version_, nonce);
+  }
+
   Ecdsa& CUP() { return *cup_.get(); }
 
  private:
   std::unique_ptr<Ecdsa> cup_;
 };
 
 TEST_F(CupEcdsaTest, SignRequest) {
   static const char kRequest[] = "TestSequenceForCupEcdsaUnitTest";
   static const char kRequestHash[] =
       "&cup2hreq="
@@ skipping 15 matching lines @@
   // In theory, this is a flaky test, as there's nothing preventing the RNG
   // from returning the same nonce twice in a row. In practice, this should
   // be fine.
   EXPECT_NE(query, query2);
 }
 
 TEST_F(CupEcdsaTest, ValidateResponse_TestETagParsing) {
   // Invalid ETags must be gracefully rejected without a crash.
   std::string query_discard;
   CUP().SignRequest("Request_A", &query_discard);
-  CUP().OverrideNonceForTesting(8, 12345);
+  OverrideNonce(12345);
 
   // Expect a pass for a well-formed etag.
   EXPECT_TRUE(CUP().ValidateResponse(
       "Response_A",
       "3044"
       "02207fb15d24e66c168ac150458c7ae51f843c4858e27d41be3f9396d4919bbd5656"
       "02202291bae598e4a41118ea1df24ce8494d4055b2842dc046e0223f5e17e86bd10e"
       ":2727bc2b3c33feb6800a830f4055901dd87d65a84184c5fbeb3f816db0a243f5"));
 
   // Reject empty etags.
@@ skipping 131 matching lines @@
       "Response_A",
       "3044"
       "022000007f24e66c168ac150458c7ae51f843c4858e27d41be3f9396d4919bbd5656"
       "02202291bae598e4a41118ea1df24ce8494d4055b2842dc046e0223f5e17e86bd10e"
       ":2727bc2b3c33feb6800a830f4055901dd87d65a84184c5fbeb3f816db0a243f5"));
 }
 
 TEST_F(CupEcdsaTest, ValidateResponse_TestSigning) {
   std::string query_discard;
   CUP().SignRequest("Request_A", &query_discard);
-  CUP().OverrideNonceForTesting(8, 12345);
+  OverrideNonce(12345);
 
   // How to generate an ECDSA signature:
   //   echo -n Request_A | sha256sum | cut -d " " -f 1 > h
   //   echo -n Response_A | sha256sum | cut -d " " -f 1 >> h
   //   cat h | xxd -r -p > hbin
   //   echo -n 8:12345 >> hbin
   //   sha256sum hbin | cut -d " " -f 1 | xxd -r -p > hbin2
   //   openssl dgst -hex -sha256 -sign ecpriv.pem hbin2 | cut -d " " -f 2 > sig
   //   echo -n :Request_A | sha256sum | cut -d " " -f 1 >> sig
   //   cat sig
@@ skipping 38 matching lines @@
   // Failure case: Request/response are intact, but the signature is invalid
   // because it was signed against a different nonce (67890).
   EXPECT_FALSE(CUP().ValidateResponse(
       "Response_A",
       "3046022100d3bbb1fb4451c8e04a07fe95404cc39121ed0e0bc084f87de19d52eee50a97"
       "bf022100dd7d41d467be2af98d9116b0c7ba09740d54578c02a02f74da5f089834be3403"
       ":2727bc2b3c33feb6800a830f4055901dd87d65a84184c5fbeb3f816db0a243f5"));
 }
 
 }  // namespace client_update_protocol