Revert 149261 - Support SHA-256 in public key pins for HTTPS.

net/url_request/url_request_unittest.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ skipping 128 matching lines @@
 
   // -1 means unknown.  0 means no encryption.
   EXPECT_GT(ssl_info.security_bits, 0);
 
   // The cipher suite TLS_NULL_WITH_NULL_NULL (0) must not be negotiated.
   int cipher_suite = SSLConnectionStatusToCipherSuite(
       ssl_info.connection_status);
   EXPECT_NE(0, cipher_suite);
 }
 
-bool FingerprintsEqual(const HashValueVector& a, const HashValueVector& b) {
+bool FingerprintsEqual(const FingerprintVector& a, const FingerprintVector& b) {
   size_t size = a.size();
 
   if (size != b.size())
     return false;
 
   for (size_t i = 0; i < size; ++i) {
     if (!a[i].Equals(b[i]))
       return false;
   }
 
@@ skipping 382 matching lines @@
     ASSERT_EQ(1, d->response_started_count()) << "request failed: " <<
         (int) r->status().status() << ", os error: " << r->status().error();
 
     EXPECT_FALSE(d->received_data_before_response());
 
     ASSERT_EQ(strlen(expected_data), static_cast<size_t>(d->bytes_received()));
     EXPECT_EQ(0, memcmp(d->data_received().c_str(), expected_data,
                         strlen(expected_data)));
   }
 
-  bool DoManyCookiesRequest(int num_cookies) {
+  bool DoManyCookiesRequest(int num_cookies){
     TestDelegate d;
     URLRequest r(test_server_.GetURL("set-many-cookies?" +
                                      base::IntToString(num_cookies)),
                                      &d,
                                      &default_context_);
 
     r.Start();
     EXPECT_TRUE(r.is_pending());
 
     MessageLoop::current()->Run();
 
     bool is_success = r.status().is_success();
 
-    if (!is_success) {
+    if (!is_success){
       // Requests handled by ChromeFrame send a less precise error message,
       // ERR_CONNECTION_ABORTED.
       EXPECT_TRUE(r.status().error() == ERR_RESPONSE_HEADERS_TOO_BIG ||
                   r.status().error() == ERR_CONNECTION_ABORTED);
       // The test server appears to be unable to handle subsequent requests
       // after this error is triggered. Force it to restart.
       EXPECT_TRUE(test_server_.Stop());
       EXPECT_TRUE(test_server_.Start());
     }
 
@@ skipping 888 matching lines @@
  protected:
   virtual ~TestSSLConfigService() {}
 
  private:
   const bool ev_enabled_;
   const bool online_rev_checking_;
 };
 
 // This the fingerprint of the "Testing CA" certificate used by the testserver.
 // See net/data/ssl/certificates/ocsp-test-root.pem.
-static const SHA1HashValue kOCSPTestCertFingerprint =
+static const SHA1Fingerprint kOCSPTestCertFingerprint =
   { { 0xf1, 0xad, 0xf6, 0xce, 0x42, 0xac, 0xe7, 0xb4, 0xf4, 0x24,
       0xdb, 0x1a, 0xf7, 0xa0, 0x9f, 0x09, 0xa1, 0xea, 0xf1, 0x5c } };
 
 // This is the policy OID contained in the certificates that testserver
 // generates.
 static const char kOCSPTestCertPolicy[] = "1.3.6.1.4.1.11129.2.4.1";
 
 class HTTPSOCSPTest : public HTTPSRequestTest {
  public:
   HTTPSOCSPTest()
@@ skipping 3113 matching lines @@
   req.SetExtraRequestHeaders(headers);
   req.Start();
   MessageLoop::current()->Run();
   // If the net tests are being run with ChromeFrame then we need to allow for
   // the 'chromeframe' suffix which is added to the user agent before the
   // closing parentheses.
   EXPECT_TRUE(StartsWithASCII(d.data_received(), "Lynx (textmode", true));
 }
 
 }  // namespace net