Add a boolean |had_context| argument to the TLS ExportKeyingMaterial

net/socket/ssl_client_socket_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 "net/socket/ssl_client_socket.h"
 
 #include "net/base/address_list.h"
 #include "net/base/cert_test_util.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/host_resolver.h"
@@ skipping 793 matching lines @@
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_EQ(net::OK, rv);
   EXPECT_TRUE(sock->IsConnected());
 
   const int kKeyingMaterialSize = 32;
   const char* kKeyingLabel1 = "client-socket-test-1";
   const char* kKeyingContext = "";
   unsigned char client_out1[kKeyingMaterialSize];
   memset(client_out1, 0, sizeof(client_out1));
-  rv = sock->ExportKeyingMaterial(kKeyingLabel1, kKeyingContext,
+  rv = sock->ExportKeyingMaterial(kKeyingLabel1, false, kKeyingContext,
                                   client_out1, sizeof(client_out1));
   EXPECT_EQ(rv, net::OK);
 
   const char* kKeyingLabel2 = "client-socket-test-2";
   unsigned char client_out2[kKeyingMaterialSize];
   memset(client_out2, 0, sizeof(client_out2));
-  rv = sock->ExportKeyingMaterial(kKeyingLabel2, kKeyingContext,
+  rv = sock->ExportKeyingMaterial(kKeyingLabel2, false, kKeyingContext,
                                   client_out2, sizeof(client_out2));
   EXPECT_EQ(rv, net::OK);
   EXPECT_NE(memcmp(client_out1, client_out2, kKeyingMaterialSize), 0);
 }
 
 // Verifies that SSLClientSocket::ClearSessionCache can be called without
 // explicit NSS initialization.
 TEST(SSLClientSocket, ClearSessionCache) {
   net::SSLClientSocket::ClearSessionCache();
 }
@@ skipping 93 matching lines @@
       ssl_info.cert->os_cert_handle(), certs[0]->os_cert_handle()));
   EXPECT_TRUE(net::X509Certificate::IsSameOSCert(
       intermediates[0], certs[1]->os_cert_handle()));
   EXPECT_TRUE(net::X509Certificate::IsSameOSCert(
       intermediates[1], certs[2]->os_cert_handle()));
 
   sock->Disconnect();
   EXPECT_FALSE(sock->IsConnected());
 }