diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 15:28:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:54:51 +0000 |
| commit | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch) | |
| tree | eb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/components/security_state | |
| parent | b014812705fc80bff0a5c120dfcef88f349816dc (diff) | |
| download | qtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz | |
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/security_state')
4 files changed, 4 insertions, 4 deletions
diff --git a/chromium/components/security_state/OWNERS b/chromium/components/security_state/OWNERS index 96886d353e1..03ba2881b38 100644 --- a/chromium/components/security_state/OWNERS +++ b/chromium/components/security_state/OWNERS @@ -1,4 +1,3 @@ -elawrence@chromium.org estark@chromium.org felt@chromium.org diff --git a/chromium/components/security_state/content/content_utils_unittest.cc b/chromium/components/security_state/content/content_utils_unittest.cc index f5140a8396f..18d8a8597a0 100644 --- a/chromium/components/security_state/content/content_utils_unittest.cc +++ b/chromium/components/security_state/content/content_utils_unittest.cc @@ -10,7 +10,7 @@ #include "base/atomic_sequence_num.h" #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/histogram_tester.h" +#include "base/test/metrics/histogram_tester.h" #include "components/security_state/core/security_state.h" #include "components/strings/grit/components_strings.h" #include "content/public/browser/security_style_explanation.h" diff --git a/chromium/components/security_state/core/security_state.h b/chromium/components/security_state/core/security_state.h index 4e6002adf8f..d50c445a58b 100644 --- a/chromium/components/security_state/core/security_state.h +++ b/chromium/components/security_state/core/security_state.h @@ -90,7 +90,8 @@ enum MaliciousContentStatus { MALICIOUS_CONTENT_STATUS_MALWARE, MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE, MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING, - MALICIOUS_CONTENT_STATUS_PASSWORD_REUSE, + MALICIOUS_CONTENT_STATUS_SIGN_IN_PASSWORD_REUSE, + MALICIOUS_CONTENT_STATUS_ENTERPRISE_PASSWORD_REUSE, }; // Describes the security status of a page or request. This is the diff --git a/chromium/components/security_state/core/security_state_unittest.cc b/chromium/components/security_state/core/security_state_unittest.cc index b3276ba1033..22edd55438e 100644 --- a/chromium/components/security_state/core/security_state_unittest.cc +++ b/chromium/components/security_state/core/security_state_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/test/histogram_tester.h" +#include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "components/security_state/core/features.h" #include "components/security_state/core/insecure_input_event_data.h" |