Index: chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc |
diff --git a/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc b/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc |
index 359ed9504b16d6f4ed64be8b0af85059fcced898..783daf8244d504d19e7c9f7fa3ace0c7654858cb 100644 |
--- a/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc |
+++ b/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc |
@@ -4,6 +4,8 @@ |
#include "chrome/browser/ssl/chrome_security_state_model_client.h" |
+#include <openssl/ssl.h> |
+ |
#include "base/command_line.h" |
#include "base/files/file_path.h" |
#include "base/macros.h" |
@@ -179,9 +181,17 @@ void CheckSecureExplanations( |
EXPECT_TRUE(is_aead); |
EXPECT_EQ(NULL, mac); // The default secure cipher does not have a MAC. |
+ base::string16 key_exchange_name = base::ASCIIToUTF16(key_exchange); |
+ if (security_info.key_exchange_group != 0) { |
lgarron
2016/09/02 22:45:33
Hmm, I specifically wanted to avoid branching in t
davidben
2016/09/02 22:46:56
Yeah, it definitely gets hit. That's what prompted
|
+ key_exchange_name = l10n_util::GetStringFUTF16( |
+ IDS_SSL_KEY_EXCHANGE_WITH_GROUP, key_exchange_name, |
+ base::ASCIIToUTF16( |
+ SSL_get_curve_name(security_info.key_exchange_group))); |
+ } |
+ |
std::vector<base::string16> description_replacements; |
description_replacements.push_back(base::ASCIIToUTF16(protocol)); |
- description_replacements.push_back(base::ASCIIToUTF16(key_exchange)); |
+ description_replacements.push_back(key_exchange_name); |
description_replacements.push_back(base::ASCIIToUTF16(cipher)); |
base::string16 secure_description = l10n_util::GetStringFUTF16( |
IDS_STRONG_SSL_DESCRIPTION, description_replacements, nullptr); |