mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 2

chore: bump chromium to e049d599a8332b9b2785b0178be74 (master) (#20314)

Browse source
This commit is contained in:
Electron Bot 2019-10-18 15:57:34 -04:00 • committed by Jeremy Apthorp
parent 0090616f7b
commit 3ac3fbdbfb
94 changed files with 670 additions and 1213 deletions
Download patch file Download diff file Expand all files Collapse all files

38
patches/chromium/ssl_security_state_tab_helper.patch
View file

@ -6,10 +6,10 @@ Subject: ssl_security_state_tab_helper.patch
Allows populating security tab info for devtools in Electron.
diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
index 887cdd11fbbd9df44edef1548a89891c5cf23cee..12da72449622289ec467d284f616bbf937ff1865 100644
index e971e3506864865d1b05218d42fa5d54a72cc742..a1aa2036c405dbbc310b12ac6c956579cf1aa1d9 100644
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -13,16 +13,20 @@
@@ -13,21 +13,25 @@
#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
@ -20,17 +20,23 @@ index 887cdd11fbbd9df44edef1548a89891c5cf23cee..12da72449622289ec467d284f616bbf9
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/safe_browsing/ui_manager.h"
+#endif
#include "chrome/browser/ssl/tls_deprecation_config.h"
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/secure_origin_whitelist.h"
+#if 0
#include "components/omnibox/browser/omnibox_field_trial.h"
#include "components/omnibox/common/omnibox_features.h"
#include "components/password_manager/core/browser/password_manager_metrics_util.h"
-#include "components/prefs/pref_service.h"
#include "components/safe_browsing/buildflags.h"
+#endif
+#include "components/prefs/pref_service.h"
#include "components/security_state/content/content_utils.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/navigation_entry.h"
@@ -44,7 +48,7 @@
@@ -50,7 +54,7 @@
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
#endif // defined(OS_CHROMEOS)
@ -39,7 +45,23 @@ index 887cdd11fbbd9df44edef1548a89891c5cf23cee..12da72449622289ec467d284f616bbf9
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#endif
@@ -66,8 +70,9 @@ void RecordSecurityLevel(
@@ -94,9 +98,12 @@ bool IsLegacyTLS(GURL url, int connection_status) {
// default we treat TLS < 1.2 as Legacy, unless the "SSLVersionMin" policy is
// set.
std::string ssl_version_min_str = switches::kSSLVersionTLSv12;
- PrefService* local_state = g_browser_process->local_state();
- if (local_state && local_state->HasPrefPath(prefs::kSSLVersionMin)) {
- ssl_version_min_str = local_state->GetString(prefs::kSSLVersionMin);
+
+ // Read directly from the command line, since our pref store is not the same
+ // as Chrome's.
+ auto* cmd_line = base::CommandLine::ForCurrentProcess();
+ if (cmd_line->HasSwitch(::switches::kSSLVersionMin)) {
+ ssl_version_min_str = cmd_line->GetSwitchValueASCII(::switches::kSSLVersionMin);
}
// Convert the pref string to an SSLVersion, if it is valid. Otherwise use the
@@ -113,8 +120,9 @@ bool IsLegacyTLS(GURL url, int connection_status) {
} // namespace
@ -50,7 +72,7 @@ index 887cdd11fbbd9df44edef1548a89891c5cf23cee..12da72449622289ec467d284f616bbf9
SecurityStateTabHelper::SecurityStateTabHelper(
content::WebContents* web_contents)
@@ -89,6 +94,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() const {
@@ -145,6 +153,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() const {
// information is still being initialized, thus no need to check for that.
state->malicious_content_status = GetMaliciousContentStatus();
@ -58,7 +80,7 @@ index 887cdd11fbbd9df44edef1548a89891c5cf23cee..12da72449622289ec467d284f616bbf9
safety_tips::ReputationWebContentsObserver* reputation_web_contents_observer =
safety_tips::ReputationWebContentsObserver::FromWebContents(
web_contents());
@@ -97,6 +103,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() const {
@@ -153,6 +162,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() const {
? reputation_web_contents_observer
->GetSafetyTipStatusForVisibleNavigation()
: security_state::SafetyTipStatus::kUnknown;
@ -66,7 +88,7 @@ index 887cdd11fbbd9df44edef1548a89891c5cf23cee..12da72449622289ec467d284f616bbf9
return state;
}
@@ -164,6 +171,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -220,6 +230,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
web_contents()->GetController().GetVisibleEntry();
if (!entry)
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -74,7 +96,7 @@ index 887cdd11fbbd9df44edef1548a89891c5cf23cee..12da72449622289ec467d284f616bbf9
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -242,6 +250,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -298,6 +309,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
break;
}
}