Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2451)

Unified Diff: chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc

Issue 2272603003: Route key_exchange_group over to DevTools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test maybe Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 e7c25a71c9fee762ae797a29b008fb0b80bc054d..0407dd4651a921803a30a1d311534e797ea577b6 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) {
+ 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);

Powered by Google App Engine
This is Rietveld 408576698