Commit 9acb315a authored by Christopher Thompson's avatar Christopher Thompson Committed by Commit Bot

Revert infobar for SSLKEYLOGFILE

After internal discussions, we've decided to hold off on infobar-ing
use of SSLKEYLOGFILE for now. We'll add metrics on usage and plan a
new rollout strategy later.

Bug: 991290
Change-Id: Ie4382dd6cd7cd752199dd55f8841bd4781305be8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1760866Reviewed-by: default avatarTommy Martino <tmartino@chromium.org>
Commit-Queue: Christopher Thompson <cthomp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689060}
parent 2feb4fe3
...@@ -9,10 +9,8 @@ ...@@ -9,10 +9,8 @@
#include "base/base_switches.h" #include "base/base_switches.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/environment.h"
#include "base/feature_list.h" #include "base/feature_list.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/strings/string_piece.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/memory_dump_manager.h"
#include "build/build_config.h" #include "build/build_config.h"
...@@ -144,9 +142,6 @@ static const char* kBadFlags[] = { ...@@ -144,9 +142,6 @@ static const char* kBadFlags[] = {
// A flag to support local file based BundledExchanges loading, only for // A flag to support local file based BundledExchanges loading, only for
// testing purpose. // testing purpose.
switches::kTrustableBundledExchangesFile, switches::kTrustableBundledExchangesFile,
// This flag causes plaintext of TLS traffic to be logged to a file.
network::switches::kSSLKeyLogFile,
}; };
#endif // OS_ANDROID #endif // OS_ANDROID
...@@ -170,18 +165,6 @@ void ShowBadFeatureFlagsInfoBar(content::WebContents* web_contents, ...@@ -170,18 +165,6 @@ void ShowBadFeatureFlagsInfoBar(content::WebContents* web_contents,
false); false);
} }
#if !defined(OS_ANDROID)
void ShowBadEnvVarsInfoBar(content::WebContents* web_contents,
int message_id,
base::StringPiece env_var) {
SimpleAlertInfoBarDelegate::Create(
InfoBarService::FromWebContents(web_contents),
infobars::InfoBarDelegate::BAD_FLAGS_INFOBAR_DELEGATE, nullptr,
l10n_util::GetStringFUTF16(message_id, base::ASCIIToUTF16(env_var)),
false);
}
#endif // OS_ANDROID
} // namespace } // namespace
void ShowBadFlagsPrompt(content::WebContents* web_contents) { void ShowBadFlagsPrompt(content::WebContents* web_contents) {
...@@ -194,17 +177,6 @@ void ShowBadFlagsPrompt(content::WebContents* web_contents) { ...@@ -194,17 +177,6 @@ void ShowBadFlagsPrompt(content::WebContents* web_contents) {
return; return;
} }
} }
// Check for the environment variable that triggers the same behavior as the
// network::switches::kSSLKeyLogFile flag.
static constexpr base::StringPiece kSSLKeyLogFileVar("SSLKEYLOGFILE");
std::unique_ptr<base::Environment> env(base::Environment::Create());
if (env->HasVar(kSSLKeyLogFileVar)) {
ShowBadEnvVarsInfoBar(web_contents,
IDS_BAD_ENVIRONMENT_VARIABLES_WARNING_MESSAGE,
kSSLKeyLogFileVar);
return;
}
#endif // OS_ANDROID #endif // OS_ANDROID
for (const base::Feature* feature : kBadFeatureFlagsInAboutFlags) { for (const base::Feature* feature : kBadFeatureFlagsInAboutFlags) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment