--- chromium-68.0.3440.106/media/base/subsample_entry.h.gcc5 2018-08-11 14:53:32.424586240 +0200 +++ chromium-68.0.3440.106/media/base/subsample_entry.h 2018-08-11 14:54:25.624590856 +0200 @@ -35,7 +35,7 @@ // does not match |input_size|. MEDIA_EXPORT bool VerifySubsamplesMatchSize( const std::vector<SubsampleEntry>& subsamples, - size_t input_size); + std::size_t input_size); } // namespace media --- chromium-68.0.3440.106/media/base/subsample_entry.cc.gcc5 2018-08-08 21:11:03.000000000 +0200 +++ chromium-68.0.3440.106/media/base/subsample_entry.cc 2018-08-11 14:54:17.134590149 +0200 @@ -10,7 +10,7 @@ namespace media { bool VerifySubsamplesMatchSize(const std::vector<SubsampleEntry>& subsamples, - size_t input_size) { + std::size_t input_size) { base::CheckedNumeric<size_t> total_size = 0; for (const auto& subsample : subsamples) { // Add each entry separately to avoid the compiler doing the wrong thing. --- chromium-68.0.3440.106/net/base/mime_util.cc.gcc5 2018-08-11 14:00:33.464311445 +0200 +++ chromium-68.0.3440.106/net/base/mime_util.cc 2018-08-11 15:50:00.174662336 +0200 @@ -527,9 +527,9 @@ base::span<const char* const> standard_types; }; static const StandardType kStandardTypes[] = { - {"image/", kStandardImageTypes}, - {"audio/", kStandardAudioTypes}, - {"video/", kStandardVideoTypes}, + {"image/", base::span<const char* const>(kStandardImageTypes)}, + {"audio/", base::span<const char* const>(kStandardAudioTypes)}, + {"video/", base::span<const char* const>(kStandardVideoTypes)}, {nullptr, base::span<const char* const>()}}; // GetExtensionsFromHardCodedMappings() adds file extensions (without a leading --- chromium-68.0.3440.106/net/cert/cert_verify_proc.cc.gcc5 2018-08-08 21:11:06.000000000 +0200 +++ chromium-68.0.3440.106/net/cert/cert_verify_proc.cc 2018-08-11 16:15:55.034529565 +0200 @@ -782,7 +782,7 @@ {{0x86, 0xc1, 0x3a, 0x34, 0x08, 0xdd, 0x1a, 0xa7, 0x7e, 0xe8, 0xb6, 0x94, 0x7c, 0x03, 0x95, 0x87, 0x72, 0xf5, 0x31, 0x24, 0x8c, 0x16, 0x27, 0xbe, 0xfb, 0x2c, 0x4f, 0x4b, 0x04, 0xd0, 0x44, 0x96}}, - kDomainsANSSI, + base::span<const base::StringPiece>(kDomainsANSSI), }, // C=IN, O=India PKI, CN=CCA India 2007 // Expires: July 4th 2015. @@ -792,7 +792,7 @@ {{0x7e, 0x6a, 0xcd, 0x85, 0x3c, 0xac, 0xc6, 0x93, 0x2e, 0x9b, 0x51, 0x9f, 0xda, 0xd1, 0xbe, 0xb5, 0x15, 0xed, 0x2a, 0x2d, 0x00, 0x25, 0xcf, 0xd3, 0x98, 0xc3, 0xac, 0x1f, 0x0d, 0xbb, 0x75, 0x4b}}, - kDomainsIndiaCCA, + base::span<const base::StringPiece>(kDomainsIndiaCCA), }, // C=IN, O=India PKI, CN=CCA India 2011 // Expires: March 11 2016. @@ -802,7 +802,7 @@ {{0x42, 0xa7, 0x09, 0x84, 0xff, 0xd3, 0x99, 0xc4, 0xea, 0xf0, 0xe7, 0x02, 0xa4, 0x4b, 0xef, 0x2a, 0xd8, 0xa7, 0x9b, 0x8b, 0xf4, 0x64, 0x8f, 0x6b, 0xb2, 0x10, 0xe1, 0x23, 0xfd, 0x07, 0x57, 0x93}}, - kDomainsIndiaCCA, + base::span<const base::StringPiece>(kDomainsIndiaCCA), }, // C=IN, O=India PKI, CN=CCA India 2014 // Expires: March 5 2024. @@ -812,7 +812,7 @@ {{0x9c, 0xf4, 0x70, 0x4f, 0x3e, 0xe5, 0xa5, 0x98, 0x94, 0xb1, 0x6b, 0xf0, 0x0c, 0xfe, 0x73, 0xd5, 0x88, 0xda, 0xe2, 0x69, 0xf5, 0x1d, 0xe6, 0x6a, 0x4b, 0xa7, 0x74, 0x46, 0xee, 0x2b, 0xd1, 0xf7}}, - kDomainsIndiaCCA, + base::span<const base::StringPiece>(kDomainsIndiaCCA), }, // Not a real certificate - just for testing. // net/data/ssl/certificates/name_constraint_*.pem @@ -820,7 +820,7 @@ {{0x8e, 0x9b, 0x14, 0x9f, 0x01, 0x45, 0x4c, 0xee, 0xde, 0xfa, 0x5e, 0x73, 0x40, 0x36, 0x21, 0xba, 0xd9, 0x1f, 0xee, 0xe0, 0x3e, 0x74, 0x25, 0x6c, 0x59, 0xf4, 0x6f, 0xbf, 0x45, 0x03, 0x5f, 0x8d}}, - kDomainsTest, + base::span<const base::StringPiece>(kDomainsTest), }, }; --- chromium-68.0.3440.106/net/ntlm/ntlm.cc.gcc5 2018-08-08 21:11:06.000000000 +0200 +++ chromium-68.0.3440.106/net/ntlm/ntlm.cc 2018-08-11 16:31:47.384836255 +0200 @@ -267,7 +267,7 @@ session_hash); GenerateResponseDesl( - ntlm_hash, base::make_span(session_hash).subspan<0, kChallengeLen>(), + ntlm_hash, base::span<unsigned char, 16ul>(session_hash).subspan<0, kChallengeLen>(), ntlm_response); } --- chromium-68.0.3440.106/net/quic/chromium/crypto/proof_verifier_chromium.cc.gcc5 2018-08-08 21:11:06.000000000 +0200 +++ chromium-68.0.3440.106/net/quic/chromium/crypto/proof_verifier_chromium.cc 2018-08-11 16:42:11.094877470 +0200 @@ -537,7 +537,7 @@ return false; } - verifier.VerifyUpdate(base::as_bytes(base::make_span(kProofSignatureLabel))); + verifier.VerifyUpdate(base::as_bytes(base::span<const char, 38ul>(kProofSignatureLabel))); uint32_t len = chlo_hash.length(); verifier.VerifyUpdate(base::as_bytes(base::make_span(&len, 1))); verifier.VerifyUpdate(base::as_bytes(base::make_span(chlo_hash))); --- chromium-68.0.3440.106/services/network/public/cpp/signed_tree_head_mojom_traits.h.gcc5 2018-08-08 21:11:08.000000000 +0200 +++ chromium-68.0.3440.106/services/network/public/cpp/signed_tree_head_mojom_traits.h 2018-08-11 16:47:56.684885963 +0200 @@ -56,7 +56,7 @@ } static base::span<const uint8_t> sha256_root_hash( const net::ct::SignedTreeHead& sth) { - return base::as_bytes(base::make_span(sth.sha256_root_hash)); + return base::as_bytes(base::span<const char, 32ul>(sth.sha256_root_hash)); } static const net::ct::DigitallySigned& signature( const net::ct::SignedTreeHead& sth) { --- chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc.gcc5 2018-08-08 21:10:43.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc 2018-08-11 17:03:45.174894052 +0200 @@ -177,7 +177,7 @@ base::span<const char* const> SettingsOverridesHandler::Keys() const { static constexpr const char* kKeys[] = {manifest_keys::kSettingsOverride}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/theme_handler.cc.gcc5 2018-08-08 21:10:43.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/theme_handler.cc 2018-08-11 18:01:42.785209758 +0200 @@ -218,7 +218,7 @@ base::span<const char* const> ThemeHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kTheme}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc.gcc5 2018-08-08 21:10:43.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc 2018-08-11 18:16:02.935007071 +0200 @@ -178,7 +178,7 @@ } base::span<const char* const> UIOverridesHandler::Keys() const { static constexpr const char* kKeys[] = {manifest_keys::kUIOverride}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc.gcc5 2018-08-08 21:10:43.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc 2018-08-11 18:20:11.774979011 +0200 @@ -57,7 +57,7 @@ base::span<const char* const> MinimumChromeVersionChecker::Keys() const { static constexpr const char* kKeys[] = {keys::kMinimumChromeVersion}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc.gcc5 2018-08-08 21:10:42.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc 2018-08-11 18:23:39.344959644 +0200 @@ -82,7 +82,7 @@ base::span<const char* const> StorageSchemaManifestHandler::Keys() const { static constexpr const char* kKeys[] = {kStorageManagedSchema}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/api/spellcheck/spellcheck_handler.cc.gcc5 2018-08-08 21:10:42.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/api/spellcheck/spellcheck_handler.cc 2018-08-11 18:23:54.104958371 +0200 @@ -65,7 +65,7 @@ base::span<const char* const> SpellcheckHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kSpellcheck}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/api/omnibox/omnibox_handler.cc.gcc5 2018-08-08 21:10:42.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/api/omnibox/omnibox_handler.cc 2018-08-11 18:26:13.904946816 +0200 @@ -51,7 +51,7 @@ base::span<const char* const> OmniboxHandler::Keys() const { static constexpr const char* kKeys[] = {manifest_keys::kOmnibox}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/api/speech/tts_engine_manifest_handler.cc.gcc5 2018-08-08 21:10:42.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/api/speech/tts_engine_manifest_handler.cc 2018-08-11 18:26:03.814947621 +0200 @@ -150,7 +150,7 @@ base::span<const char* const> TtsEngineManifestHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kTtsEngine}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/api/system_indicator/system_indicator_handler.cc.gcc5 2018-08-08 21:10:42.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/api/system_indicator/system_indicator_handler.cc 2018-08-11 18:28:35.884935890 +0200 @@ -41,7 +41,7 @@ base::span<const char* const> SystemIndicatorHandler::Keys() const { static constexpr const char* kKeys[] = {manifest_keys::kSystemIndicator}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/api/commands/commands_handler.cc.gcc5 2018-08-08 21:10:42.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/api/commands/commands_handler.cc 2018-08-11 18:28:23.314936830 +0200 @@ -149,7 +149,7 @@ base::span<const char* const> CommandsHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kCommands}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/api/url_handlers/url_handlers_parser.cc.gcc5 2018-08-08 21:10:42.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/api/url_handlers/url_handlers_parser.cc 2018-08-11 18:31:08.754995941 +0200 @@ -188,7 +188,7 @@ base::span<const char* const> UrlHandlersParser::Keys() const { static constexpr const char* kKeys[] = {mkeys::kUrlHandlers}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/chrome_manifest_url_handlers.cc.gcc5 2018-08-08 21:10:42.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/chrome_manifest_url_handlers.cc 2018-08-11 18:32:26.875022457 +0200 @@ -84,7 +84,7 @@ base::span<const char* const> DevToolsPageHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kDevToolsPage}; - return kKeys; + return base::span<const char* const>(kKeys); } URLOverridesHandler::URLOverridesHandler() { @@ -181,7 +181,7 @@ base::span<const char* const> URLOverridesHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kChromeURLOverrides}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/app_icon_color_info.cc.gcc5 2018-08-08 21:10:43.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/app_icon_color_info.cc 2018-08-11 18:36:24.995082349 +0200 @@ -79,7 +79,7 @@ base::span<const char* const> AppIconColorHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kAppIconColor}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/app_theme_color_info.cc.gcc5 2018-08-08 21:10:43.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/app_theme_color_info.cc 2018-08-11 18:36:12.625079873 +0200 @@ -62,7 +62,7 @@ base::span<const char* const> AppThemeColorHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kAppThemeColor}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/app_launch_info.cc.gcc5 2018-08-08 21:10:43.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/app_launch_info.cc 2018-08-11 18:36:03.325077971 +0200 @@ -317,7 +317,7 @@ static constexpr const char* kKeys[] = { keys::kLaunchLocalPath, keys::kLaunchWebURL, keys::kLaunchContainer, keys::kLaunchHeight, keys::kLaunchWidth}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/extension_action_handler.cc.gcc5 2018-08-08 21:10:43.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/extension_action_handler.cc 2018-08-11 18:38:39.935105830 +0200 @@ -130,7 +130,7 @@ static constexpr const char* kKeys[] = { manifest_keys::kPageAction, manifest_keys::kBrowserAction, manifest_keys::kSynthesizeExtensionAction}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/linked_app_icons.cc.gcc5 2018-08-08 21:10:43.000000000 +0200 +++ chromium-68.0.3440.106/chrome/common/extensions/manifest_handlers/linked_app_icons.cc 2018-08-11 18:38:30.355104359 +0200 @@ -108,7 +108,7 @@ base::span<const char* const> LinkedAppIconsHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kLinkedAppIcons}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/default_locale_handler.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/default_locale_handler.cc 2018-08-11 18:47:07.165155055 +0200 @@ -115,7 +115,7 @@ base::span<const char* const> DefaultLocaleHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kDefaultLocale}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/webview_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/webview_info.cc 2018-08-11 18:46:58.855154575 +0200 @@ -189,7 +189,7 @@ base::span<const char* const> WebviewHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kWebview}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/file_handler_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/file_handler_info.cc 2018-08-11 18:50:18.355164238 +0200 @@ -212,7 +212,7 @@ base::span<const char* const> FileHandlersParser::Keys() const { static constexpr const char* kKeys[] = {keys::kFileHandlers}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/app_isolation_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/app_isolation_info.cc 2018-08-11 19:04:21.135091706 +0200 @@ -97,7 +97,7 @@ base::span<const char* const> AppIsolationHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kIsolation}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/automation.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/automation.cc 2018-08-11 19:04:08.095104000 +0200 @@ -178,7 +178,7 @@ base::span<const char* const> AutomationHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kAutomation}; - return kKeys; + return base::span<const char* const>(kKeys); } ManifestPermission* AutomationHandler::CreatePermission() { --- chromium-68.0.3440.106/chrome/browser/ui/webui/policy_tool_ui_handler.cc.gcc5 2018-08-08 21:10:41.000000000 +0200 +++ chromium-68.0.3440.106/chrome/browser/ui/webui/policy_tool_ui_handler.cc 2018-08-11 19:50:34.564587432 +0200 @@ -534,11 +534,11 @@ ->registry(); scoped_refptr<policy::SchemaMap> schema_map = registry->schema_map(); - for (const auto& policies_dict : policies_dict->DictItems()) { + for (const auto& policies_dict2 : policies_dict->DictItems()) { policy::PolicyNamespace policy_domain; - if (policies_dict.first == "chromePolicies") { + if (policies_dict2.first == "chromePolicies") { policy_domain = policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, ""); - } else if (policies_dict.first == "extensionPolicies") { + } else if (policies_dict2.first == "extensionPolicies") { policy_domain = policy::PolicyNamespace(policy::POLICY_DOMAIN_EXTENSIONS, ""); } else { @@ -547,6 +547,6 @@ continue; } const policy::Schema* schema = schema_map->GetSchema(policy_domain); - ParseSourcePolicyTypes(schema, &policies_dict.second); + ParseSourcePolicyTypes(schema, &policies_dict2.second); } } --- chromium-68.0.3440.106/extensions/common/manifest_handlers/web_accessible_resources_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/web_accessible_resources_info.cc 2018-08-11 20:34:24.654749084 +0200 @@ -92,7 +92,7 @@ base::span<const char* const> WebAccessibleResourcesHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kWebAccessibleResources}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/api/printer_provider/usb_printer_manifest_handler.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/api/printer_provider/usb_printer_manifest_handler.cc 2018-08-11 20:57:35.014635693 +0200 @@ -32,7 +32,7 @@ base::span<const char* const> UsbPrinterManifestHandler::Keys() const { static constexpr const char* kKeys[] = {manifest_keys::kUsbPrinters}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/api/sockets/sockets_manifest_handler.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/api/sockets/sockets_manifest_handler.cc 2018-08-11 21:03:48.244608458 +0200 @@ -42,7 +42,7 @@ base::span<const char* const> SocketsManifestHandler::Keys() const { static constexpr const char* kKeys[] = {manifest_keys::kSockets}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/offline_enabled_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/offline_enabled_info.cc 2018-08-11 21:15:52.904577337 +0200 @@ -74,7 +74,7 @@ base::span<const char* const> OfflineEnabledHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kOfflineEnabled}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/background_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/background_info.cc 2018-08-11 21:26:52.564698736 +0200 @@ -330,7 +330,7 @@ keys::kBackgroundAllowJsAccess, keys::kBackgroundPage, keys::kBackgroundPersistent, keys::kBackgroundScripts, keys::kPlatformAppBackgroundPage, keys::kPlatformAppBackgroundScripts}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/content_capabilities_handler.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/content_capabilities_handler.cc 2018-08-11 21:26:38.664696082 +0200 @@ -120,7 +120,7 @@ base::span<const char* const> ContentCapabilitiesHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kContentCapabilities}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/content_scripts_handler.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/content_scripts_handler.cc 2018-08-11 21:31:04.534737516 +0200 @@ -372,7 +372,7 @@ base::span<const char* const> ContentScriptsHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kContentScripts}; - return kKeys; + return base::span<const char* const>(kKeys); } bool ContentScriptsHandler::Parse(Extension* extension, base::string16* error) { --- chromium-68.0.3440.106/extensions/common/manifest_handlers/csp_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/csp_info.cc 2018-08-11 21:35:29.754764634 +0200 @@ -158,10 +158,10 @@ if (is_platform_app_) { static constexpr const char* kKeys[] = { keys::kPlatformAppContentSecurityPolicy}; - return kKeys; + return base::span<const char* const>(kKeys); } static constexpr const char* kKeys[] = {keys::kContentSecurityPolicy}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/shared_module_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/shared_module_info.cc 2018-08-11 21:39:19.204781141 +0200 @@ -240,7 +240,7 @@ base::span<const char* const> SharedModuleHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kExport, keys::kImport}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/api/declarative_net_request/dnr_manifest_handler.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/api/declarative_net_request/dnr_manifest_handler.cc 2018-08-11 21:55:10.484901903 +0200 @@ -85,7 +85,7 @@ base::span<const char* const> DNRManifestHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kDeclarativeNetRequestKey}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace declarative_net_request --- chromium-68.0.3440.106/extensions/common/api/bluetooth/bluetooth_manifest_handler.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/api/bluetooth/bluetooth_manifest_handler.cc 2018-08-11 22:05:47.225247303 +0200 @@ -42,7 +42,7 @@ base::span<const char* const> BluetoothManifestHandler::Keys() const { static constexpr const char* kKeys[] = {manifest_keys::kBluetooth}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/api/declarative/declarative_manifest_handler.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/api/declarative/declarative_manifest_handler.cc 2018-08-11 22:09:53.675325930 +0200 @@ -31,7 +31,7 @@ base::span<const char* const> DeclarativeManifestHandler::Keys() const { static constexpr const char* kKeys[] = {manifest_keys::kEventRules}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/externally_connectable.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/externally_connectable.cc 2018-08-11 22:14:09.335392770 +0200 @@ -86,7 +86,7 @@ base::span<const char* const> ExternallyConnectableHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kExternallyConnectable}; - return kKeys; + return base::span<const char* const>(kKeys); } // static --- chromium-68.0.3440.106/content/browser/background_fetch/background_fetch_context.cc.gcc5 2018-08-11 22:29:27.505720895 +0200 +++ chromium-68.0.3440.106/content/browser/background_fetch/background_fetch_context.cc 2018-08-11 22:29:49.915752196 +0200 @@ -218,7 +218,7 @@ scheduler_->AddJobController(controller.get()); - job_controllers_.insert({unique_id, std::move(controller)}); + job_controllers_.insert(std::pair<std::string, std::unique_ptr<BackgroundFetchJobController>>(unique_id, std::move(controller))); std::move(done_closure).Run(); } --- chromium-68.0.3440.106/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5 2018-08-08 21:11:09.000000000 +0200 +++ chromium-68.0.3440.106/services/viz/public/cpp/compositing/filter_operation_struct_traits.h 2018-08-11 23:11:12.477113712 +0200 @@ -141,7 +141,7 @@ const cc::FilterOperation& operation) { if (operation.type() != cc::FilterOperation::COLOR_MATRIX) return base::nullopt; - return base::make_span(operation.matrix()); + return base::span<const float>(operation.matrix()); } static base::span<const gfx::Rect> shape( --- chromium-68.0.3440.106/extensions/common/manifest_handlers/options_page_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/options_page_info.cc 2018-08-11 23:39:08.807229848 +0200 @@ -224,7 +224,7 @@ base::span<const char* const> OptionsPageManifestHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kOptionsPage, keys::kOptionsUI}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/incognito_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/incognito_info.cc 2018-08-11 23:38:57.207249719 +0200 @@ -81,7 +81,7 @@ base::span<const char* const> IncognitoHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kIncognito}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/mime_types_handler.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/mime_types_handler.cc 2018-08-11 23:53:22.726509850 +0200 @@ -144,5 +144,5 @@ base::span<const char* const> MimeTypesHandlerParser::Keys() const { static constexpr const char* kKeys[] = {keys::kMIMETypes, keys::kMimeTypesHandler}; - return kKeys; + return base::span<const char* const>(kKeys); } --- chromium-68.0.3440.106/extensions/common/manifest_handlers/sandboxed_page_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/sandboxed_page_info.cc 2018-08-12 00:05:51.846358605 +0200 @@ -126,7 +126,7 @@ base::span<const char* const> SandboxedPageHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kSandboxedPages}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/oauth2_manifest_handler.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/oauth2_manifest_handler.cc 2018-08-12 00:07:03.076351090 +0200 @@ -96,7 +96,7 @@ base::span<const char* const> OAuth2ManifestHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kOAuth2}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/icons_handler.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/icons_handler.cc 2018-08-12 00:30:10.005455769 +0200 @@ -85,7 +85,7 @@ base::span<const char* const> IconsHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kIcons}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_url_handlers.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_url_handlers.cc 2018-08-12 00:32:03.075419158 +0200 @@ -121,7 +121,7 @@ base::span<const char* const> HomepageURLHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kHomepageURL}; - return kKeys; + return base::span<const char* const>(kKeys); } UpdateURLHandler::UpdateURLHandler() { @@ -154,7 +154,7 @@ base::span<const char* const> UpdateURLHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kUpdateURL}; - return kKeys; + return base::span<const char* const>(kKeys); } AboutPageHandler::AboutPageHandler() { @@ -206,7 +206,7 @@ base::span<const char* const> AboutPageHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kAboutPage}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/extensions/common/manifest_handlers/requirements_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/requirements_info.cc 2018-08-12 09:46:27.205042563 +0200 @@ -43,7 +43,7 @@ base::span<const char* const> RequirementsHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kRequirements}; - return kKeys; + return base::span<const char* const>(kKeys); } bool RequirementsHandler::AlwaysParseForType(Manifest::Type type) const { --- chromium-68.0.3440.106/extensions/common/manifest_handlers/kiosk_mode_info.cc.gcc5 2018-08-08 21:10:57.000000000 +0200 +++ chromium-68.0.3440.106/extensions/common/manifest_handlers/kiosk_mode_info.cc 2018-08-12 09:50:09.995012742 +0200 @@ -214,7 +214,7 @@ static constexpr const char* kKeys[] = {keys::kKiosk, keys::kKioskEnabled, keys::kKioskOnly, keys::kKioskSecondaryApps}; - return kKeys; + return base::span<const char* const>(kKeys); } } // namespace extensions --- chromium-68.0.3440.106/content/renderer/input/input_event_prediction.cc.gcc5 2018-08-08 21:10:55.000000000 +0200 +++ chromium-68.0.3440.106/content/renderer/input/input_event_prediction.cc 2018-08-12 10:48:39.504354025 +0200 @@ -119,7 +119,7 @@ if (predictor != pointer_id_predictor_map_.end()) { predictor->second->Update(data); } else { - pointer_id_predictor_map_.insert({event.id, SetUpPredictor()}); + pointer_id_predictor_map_.insert(std::pair<ui::PointerId, std::unique_ptr<ui::InputPredictor>>(event.id, SetUpPredictor())); pointer_id_predictor_map_[event.id]->Update(data); } }