Merge pull request #15857 from brave/107.0.5304.110_master
Upgrade from Chromium 107.0.5304.91 to Chromium 107.0.5304.110.
This commit is contained in:
@@ -79,12 +79,14 @@ void BindNetworkChangeManagerReceiver(
|
||||
ApplicationContextImpl::ApplicationContextImpl(
|
||||
base::SequencedTaskRunner* local_state_task_runner,
|
||||
const base::CommandLine& command_line,
|
||||
const std::string& locale)
|
||||
const std::string& locale,
|
||||
const std::string& country)
|
||||
: local_state_task_runner_(local_state_task_runner) {
|
||||
DCHECK(!GetApplicationContext());
|
||||
SetApplicationContext(this);
|
||||
|
||||
SetApplicationLocale(locale);
|
||||
application_country_ = country;
|
||||
|
||||
// update_client::UpdateQueryParams::SetDelegate(
|
||||
// IOSChromeUpdateQueryParamsDelegate::GetInstance());
|
||||
@@ -200,6 +202,12 @@ const std::string& ApplicationContextImpl::GetApplicationLocale() {
|
||||
return application_locale_;
|
||||
}
|
||||
|
||||
const std::string& ApplicationContextImpl::GetApplicationCountry() {
|
||||
DCHECK(thread_checker_.CalledOnValidThread());
|
||||
DCHECK(!application_country_.empty());
|
||||
return application_country_;
|
||||
}
|
||||
|
||||
ios::ChromeBrowserStateManager*
|
||||
ApplicationContextImpl::GetChromeBrowserStateManager() {
|
||||
DCHECK(thread_checker_.CalledOnValidThread());
|
||||
|
||||
@@ -17,9 +17,9 @@ bool ParseCertificatesFile(base::StringPiece certs_input,
|
||||
Pinsets* pinsets,
|
||||
base::Time* timestamp) {
|
||||
base::StringPiece brave_certs = R"brave_certs(
|
||||
# Last updated: Thu Oct 27 22:02:58 UTC 2022
|
||||
# Last updated: Tue Nov 8 23:47:24 UTC 2022
|
||||
PinsListTimestamp
|
||||
1666908178
|
||||
1667951244
|
||||
|
||||
# =====BEGIN BRAVE ROOTS ASC=====
|
||||
#From https://www.amazontrust.com/repository/
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include "base/metrics/user_metrics.h"
|
||||
#include "base/path_service.h"
|
||||
#include "base/strings/sys_string_conversions.h"
|
||||
#include "base/task/sequenced_task_runner.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "brave/ios/browser/browser_state/brave_browser_state_keyed_service_factories.h"
|
||||
@@ -64,7 +65,9 @@ void BraveWebMainParts::PreCreateThreads() {
|
||||
CHECK(base::PathService::Get(ios::FILE_LOCAL_STATE, &local_state_path));
|
||||
application_context_.reset(new ApplicationContextImpl(
|
||||
local_state_task_runner.get(), *base::CommandLine::ForCurrentProcess(),
|
||||
l10n_util::GetLocaleOverride()));
|
||||
l10n_util::GetLocaleOverride(),
|
||||
base::SysNSStringToUTF8(
|
||||
[[NSLocale currentLocale] objectForKey:NSLocaleCountryCode])));
|
||||
DCHECK_EQ(application_context_.get(), GetApplicationContext());
|
||||
|
||||
// Initialize local state.
|
||||
|
||||
+1
-1
@@ -262,7 +262,7 @@
|
||||
"projects": {
|
||||
"chrome": {
|
||||
"dir": "src",
|
||||
"tag": "107.0.5304.91",
|
||||
"tag": "107.0.5304.110",
|
||||
"repository": {
|
||||
"url": "https://github.com/chromium/chromium"
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
diff --git a/chrome/VERSION b/chrome/VERSION
|
||||
index cab10a33da59113d379ab38e6d493796f97d07a3..68a3c3197db3503e853c8986c70a0e383f0822b4 100644
|
||||
index e247c5ef2ae959c839ecc4b26558f08bb0a38710..1d3017d0fb4697d5f0b33751ebd22e1f63415171 100644
|
||||
--- a/chrome/VERSION
|
||||
+++ b/chrome/VERSION
|
||||
@@ -1,4 +1,4 @@
|
||||
MAJOR=107
|
||||
-MINOR=0
|
||||
-BUILD=5304
|
||||
-PATCH=91
|
||||
-PATCH=110
|
||||
+MINOR=1
|
||||
+BUILD=47
|
||||
+PATCH=57
|
||||
|
||||
Reference in New Issue
Block a user