Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade from Chromium 119 to Chromium 120. #20434

Merged
merged 110 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
8e8e8f1
Update from Chromium 119.0.6045.163 to Chromium 120.0.6099.35.
cdesouza-chromium Oct 5, 2023
d9de366
Conflict-resolved patches from Chromium 119.0.6045.163 to Chromium 12…
cdesouza-chromium Oct 5, 2023
75f4248
Update patches from Chromium 119.0.6045.163 to Chromium 120.0.6099.35.
cdesouza-chromium Nov 10, 2023
14babbf
Updated strings for Chromium 120.0.6099.28.
cdesouza-chromium Nov 10, 2023
1d8262e
`kExtensionTelemetry` deleted upstream
cdesouza-chromium Oct 6, 2023
111b340
`kSendTabToSelfSigninPromo` deleted upstream
cdesouza-chromium Oct 6, 2023
f9c07d7
`//net` url functions takeing `string_view`
cdesouza-chromium Oct 6, 2023
4e90f11
`CookieSettings` constructor updated
cdesouza-chromium Oct 6, 2023
835d0f6
Browser `reading_list` moved into `model` subfolder
cdesouza-chromium Oct 6, 2023
e857c87
`OriginTrialFeature` moved under `mojom` namespace
cdesouza-chromium Oct 6, 2023
1e6fb91
Fix override for `flags.ts` renamed to `app.ts`
cdesouza-chromium Oct 6, 2023
1e842e3
[ios] `synced_sessions` moved into `model` subfolder
cdesouza-chromium Oct 6, 2023
e036f7c
`intent_picker` moved to `link_capturing`
cdesouza-chromium Oct 6, 2023
2175892
Reanchoring `SetCookieInfo` overrides.
cdesouza-chromium Oct 6, 2023
d47c6e1
`kIPHPerformanceNewBadgeFeature` removed upstream
cdesouza-chromium Oct 6, 2023
c5eef87
[ios] `invalidation` moved into `model` subfolder
cdesouza-chromium Oct 6, 2023
b76031d
[Android] Rename SharedPreferencesManager -> ChromeSharedPreferences
samartnik Oct 11, 2023
954c974
[Android] Delete @maindex
samartnik Oct 11, 2023
620264d
[Android] Minor code adjustments to the C120 upstream changes
samartnik Oct 11, 2023
368fb31
[Android] ManageAccountDevicesLinkView#inflateIfVisible was removed
samartnik Oct 11, 2023
7513c96
`kInspireMe` feature flag deleted
cdesouza-chromium Oct 10, 2023
4cc78a5
`kOmniboxMostVisitedTilesOnSrp` feature flag deleted
cdesouza-chromium Oct 10, 2023
6c4dbdc
[ios] Browser `passwords` moved into `model` subfolder
cdesouza-chromium Oct 10, 2023
004034d
InstallConstants no longer has supports_retention_experiments field.
mkarolin Oct 13, 2023
72f140e
`FindBrowserWithWebContents` renamed upstream
cdesouza-chromium Oct 11, 2023
bfa35de
`web_app` namespace reanmed
cdesouza-chromium Oct 11, 2023
982b44a
`TabSearchButton` constructor taking a controller
cdesouza-chromium Oct 11, 2023
2fc3485
Fixing `SidePanelEntryId` broken replacements
cdesouza-chromium Oct 11, 2023
b356f5e
`SetLastCompleteTime` removed from `DownloadPrefs`
cdesouza-chromium Oct 12, 2023
d9dfdf5
Path for `devtools_ui.h` changed upstream
cdesouza-chromium Oct 12, 2023
6c3aa1d
[Android] Privacy settings clean up
samartnik Oct 16, 2023
cb98957
Signature for DecodeURLEscapeSequences was changed
samartnik Oct 17, 2023
5ada644
`chrome_notification_types.h` header renamed
cdesouza-chromium Oct 13, 2023
a1aab11
`PasswordStoreFactory` renamed
cdesouza-chromium Oct 16, 2023
e3ad60d
`content::ExecJs` is `nodiscard`
cdesouza-chromium Oct 16, 2023
2eeb5fd
`NSSwitchButton` deprecated by Apple.
cdesouza-chromium Oct 16, 2023
0459a19
Fix history menu overrides
cdesouza-chromium Oct 16, 2023
45e8390
Delete used `CreateVectorValuesPtr`
cdesouza-chromium Oct 16, 2023
66d742f
`IOSChromePasswordStoreFactory` renamed
cdesouza-chromium Oct 16, 2023
d020560
`kLinkCapturingInfoBar` deleted upstream
cdesouza-chromium Oct 17, 2023
36df520
`kAutofillEnableOfferNotificationForPromoCodes` deleted upstream
cdesouza-chromium Oct 17, 2023
9f99389
`InfoBarManager` with accessor for infobar container
cdesouza-chromium Oct 17, 2023
41f3231
assert_ts.js -> assert.js
mkarolin Oct 20, 2023
69b105c
WIP: Includes order causes a build error on Linux.
mkarolin Oct 20, 2023
876f3c1
[Android] AutofillPopupBridge was removed
samartnik Oct 23, 2023
95cd027
[Android] Fixes for app menu position
samartnik Oct 23, 2023
0c849a2
[Android] Migrating all JNI annotations in /base to jni_zero copies
samartnik Oct 23, 2023
d523b95
[Android] Fixes for java formatting for C120 changes
samartnik Oct 23, 2023
19e660b
WIP: Fixes crash in Brave browser tests.
mkarolin Oct 24, 2023
d8e70c4
IdentityManager c'tor now requires SigninClient.
mkarolin Oct 26, 2023
dfe612d
`kHeuristicMemorySaver` deleted upstream
cdesouza-chromium Oct 19, 2023
83b77ce
Reanchoring `OmniboxPopupViewViews` overrides
cdesouza-chromium Oct 19, 2023
69d7632
Provide action ids for Brave side panel actions
cdesouza-chromium Oct 19, 2023
7e24d1c
`TrackingProtectionSettings` taking incognito flag
cdesouza-chromium Oct 19, 2023
1d40aaf
Generate legacy JS bidings for `brave_federated` interfaces
cdesouza-chromium Oct 23, 2023
69c6b67
Fixing `ChromeBrowsingDataRemoverDelegate` new occurrence
cdesouza-chromium Oct 23, 2023
8cc107b
Adjust `GetWebUIMessageHandlers` override
cdesouza-chromium Oct 23, 2023
8175f32
`Command::MAX` renamed to `kMaxValue`
cdesouza-chromium Oct 23, 2023
41aab1b
Browser `search_engines` moved into `model/` subfolder
cdesouza-chromium Oct 23, 2023
664d94b
`base::Time` conversion function renamed
cdesouza-chromium Oct 24, 2023
73c3f49
`PrimaryAccountManager::Initialize` simplified
cdesouza-chromium Oct 24, 2023
f55644d
Unused argument removed from bookmark encoding
cdesouza-chromium Oct 24, 2023
ffec51a
`SyncablePrefMetadata` takes an enum for pref sensitivity
cdesouza-chromium Oct 24, 2023
da32f5c
`kAttributionReportingNullAggregatableReports` deleted upstream
cdesouza-chromium Oct 24, 2023
7c26b0a
`PrivacySandboxSettings` delegate mocked method redefined
cdesouza-chromium Oct 24, 2023
180e888
Reanchoring `ProxyServerToPacResultElement` override
cdesouza-chromium Oct 24, 2023
6891834
Upstream has moved bundle exclusions into gn files
cdesouza-chromium Oct 25, 2023
01e05e3
`ConsoleMessage` changed accessors for Level and Source
cdesouza-chromium Oct 25, 2023
5cbb5d2
[Android] Deleting fragment activity replacer
samartnik Oct 27, 2023
36cb6d0
[Android] Remove AndroidX core dependency for base_java
samartnik Oct 27, 2023
b140285
[Android] kIdentityStatusConsistency flag was removed
samartnik Oct 27, 2023
10f1e48
[Android] New signature for AutocompleteMediator#loadUrlForOmniboxMatch
samartnik Oct 27, 2023
fcdb116
[Android] Fix for new lint issue
samartnik Oct 27, 2023
5e3266b
BookmarkSyncServiceFactory was renamed.
mkarolin Oct 27, 2023
250c8a9
chrome/common/url_constants.cc was removed.
mkarolin Oct 27, 2023
b0c1c74
Inactive user toast has been removed.
mkarolin Oct 28, 2023
e211782
[iOS] Move ios/c/b/memory to model subfolder
mkarolin Oct 28, 2023
418b45a
`DIR_SOURCE_ROOT` deleted
cdesouza-chromium Oct 25, 2023
459bf2b
Fix breakpad patch for `IsValidCrashReportId`
cdesouza-chromium Oct 26, 2023
8ae208f
`kTrackingProtectionOnboardingForceEligibility` deleted upstream
cdesouza-chromium Oct 26, 2023
e67f589
Reanchoring `ProfileWriter` overrides
cdesouza-chromium Oct 26, 2023
cc36b57
Security interstitials were migrated to JS module.
mkarolin Oct 30, 2023
ed23fc3
WIP: Fixes failing manget URL browser tests.
mkarolin Oct 31, 2023
3ba2b58
New link to Google play store added to url constants
cdesouza-chromium Oct 30, 2023
1491538
Removing unused imports on skus
cdesouza-chromium Oct 30, 2023
ff555f2
Browser `tabs` moved into `model/` subfolder
cdesouza-chromium Oct 30, 2023
9fb40e6
Provide `PermissionPrompt` finalise requests overrides
cdesouza-chromium Oct 31, 2023
a3a4602
[Android] Adjustments for PermissionDialog refactor
samartnik Nov 1, 2023
eafebce
[Android] Changes for location_status_icon
samartnik Nov 1, 2023
93336de
[Android] Fixes for Widevine unit tests
samartnik Nov 1, 2023
4c6553c
Update how to check tab container type
sangwoo108 Nov 2, 2023
99641ce
Disables crashing upstream unit tests.
mkarolin Nov 2, 2023
246b336
Update SidebarContainerView to allow for nullptr button.
mkarolin Nov 3, 2023
03689ef
Disable crashing upstream browser tests.
mkarolin Nov 3, 2023
a8220fb
Define `kSafeBrowsingUseInChromeURL` url constant
cdesouza-chromium Nov 1, 2023
1f969af
Fix `PrivacySandboxSettings` delegate mocking
cdesouza-chromium Nov 9, 2023
750d1de
Fix `MockPrivacySandboxDelegate` missing abstract
cdesouza-chromium Nov 14, 2023
ad8ce55
Disables upstream features flagged by security/privacy teams.
mkarolin Nov 15, 2023
2960a79
Disables Tracking Protection Oboarding.
mkarolin Nov 16, 2023
c5717e9
Revert "WIP: Fixes crash in Brave browser tests."
mkarolin Nov 18, 2023
5805e24
Extending `ContentSettingsType` with an override
cdesouza-chromium Nov 18, 2023
9773959
Revert "Fixing `ChromeBrowsingDataRemoverDelegate` new occurrence"
cdesouza-chromium Nov 18, 2023
27654d9
Revert "Extending `ContentSettingsType` with an override"
cdesouza-chromium Nov 20, 2023
2825a28
Revert "Fix breakpad patch for `IsValidCrashReportId`"
cdesouza-chromium Nov 20, 2023
5253671
[patching] Delete unused linux patch
cdesouza-chromium Nov 20, 2023
447231c
[skus] Formmating changes
cdesouza-chromium Nov 20, 2023
a118755
Fixes upstream shared storage browser tests.
mkarolin Nov 20, 2023
6824eba
[Android] Fix for unregistered kEnableSnippetsByDse preference
samartnik Nov 20, 2023
96e5747
[Android] monochrome_public_apk was renamed.
mkarolin Nov 22, 2023
b84bab2
Disable additional crashing/failing upstream browser tests.
mkarolin Nov 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
//net url functions takeing string_view
Upstream util functions for URL manipulation that used to take a
pointer/size pair, have been updated to take a `string_view` and this
change corrects all the callers in Brave accordingly.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/cc4d2b28d2c37283f8532d5caa042ff1fb2bfdb3

commit cc4d2b28d2c37283f8532d5caa042ff1fb2bfdb3
Author: David Benjamin <davidben@chromium.org>
Date:   Mon Oct 2 23:12:04 2023 +0000

    Replace some ptr/len APIs in //url with std::string_view

    This is both safer and more convenient.
  • Loading branch information
cdesouza-chromium authored and mkarolin committed Nov 27, 2023
commit f9c07d7d540bc184f3074079fdb356058e5991cc
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const char kScriptRunEmptyAndCheckChainResult[] = R"(

std::string EncodeQuery(const std::string& query) {
url::RawCanonOutputT<char> buffer;
url::EncodeURIComponent(query.data(), query.size(), &buffer);
url::EncodeURIComponent(query, &buffer);
return std::string(buffer.data(), buffer.length());
}

Expand Down
7 changes: 3 additions & 4 deletions browser/ntp_background/custom_background_file_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,8 @@ class CustomBackgroundFileManager final {
const auto path = value.path().substr(1);
DCHECK(!path.empty()) << "URL path is empty " << value;
url::RawCanonOutputT<char16_t> decoded_value;
url::DecodeURLEscapeSequences(path.data(), path.length(),
url::DecodeURLMode::kUTF8OrIsomorphic,
&decoded_value);
url::DecodeURLEscapeSequences(
path, url::DecodeURLMode::kUTF8OrIsomorphic, &decoded_value);
value_ = base::UTF16ToUTF8(
std::u16string(decoded_value.data(), decoded_value.length()));
} else {
Expand Down Expand Up @@ -136,7 +135,7 @@ class CustomBackgroundFileManager final {
// Do percent encoding and compose it with base url so that it can
// be used as webui data url.
url::RawCanonOutputT<char> encoded;
url::EncodeURIComponent(value_.c_str(), value_.length(), &encoded);
url::EncodeURIComponent(value_, &encoded);
return GURL(ntp_background_images::kCustomWallpaperURL +
std::string(encoded.data(), encoded.length()));
} else {
Expand Down
12 changes: 2 additions & 10 deletions browser/ui/views/brave_player/brave_player_action_icon_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,9 @@ GURL GetPlayerURL(content::WebContents* web_contents) {
url.has_query()) {
if (std::string video_id; net::GetValueForKeyInQuery(url, "v", &video_id)) {
url::RawCanonOutputT<char> encoded_video_id;
// TODO(sko) In the latest upstream code, these are refactored to use
// std::string_view directly. So the following code should be
//
// url::EncodeURIComponent(video_id, &encoded_video_id);
// return GURL(base::StrCat({kBravePlayerURL, "youtube/",
// encoded_video_id.view()}));
url::EncodeURIComponent(video_id.data(), video_id.size(),
&encoded_video_id);
url::EncodeURIComponent(video_id, &encoded_video_id);
return GURL(base::StrCat({brave_player::kBravePlayerURL, "youtube/",
std::string_view(encoded_video_id.data(),
encoded_video_id.length())}));
encoded_video_id.view()}));
}
}
return {};
Expand Down
3 changes: 1 addition & 2 deletions components/brave_vpn/browser/brave_vpn_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,7 @@ void BraveVpnService::OnPrepareCredentialsPresentation(
net::cookie_util::ParseCookieExpirationTime(credential_cookie.Expires());
url::RawCanonOutputT<char16_t> unescaped;
url::DecodeURLEscapeSequences(
encoded_credential.data(), encoded_credential.size(),
url::DecodeURLMode::kUTF8OrIsomorphic, &unescaped);
encoded_credential, url::DecodeURLMode::kUTF8OrIsomorphic, &unescaped);
std::string credential;
base::UTF16ToUTF8(unescaped.data(), unescaped.length(), &credential);
if (credential.empty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ GURL FixupWaybackQueryURL(const GURL& url) {
for (net::QueryIterator it(url); !it.IsAtEnd(); it.Advance()) {
std::string key = std::string(it.GetKey());
url::RawCanonOutputW<1024> canonOutput;
url::DecodeURLEscapeSequences(key.c_str(), key.length(),
url::DecodeURLMode::kUTF8OrIsomorphic,
url::DecodeURLEscapeSequences(key, url::DecodeURLMode::kUTF8OrIsomorphic,
&canonOutput);
const std::string decoded_key = base::UTF16ToUTF8(
std::u16string_view(canonOutput.data(), canonOutput.length()));
Expand Down