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 patches from Chromium 78.0.3904.50 to Chromium 78.0.3904.70 (uplift to 0.70.x) #3772

Merged
merged 1 commit into from
Oct 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions app/settings_brave_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,12 @@
</message>
</if>
<if expr="chromeos">
<message name="IDS_SETTINGS_ABOUT_OS_BANNER" desc="Banner displayed in the browser About page that links to the OS About page.">
For Brave OS details, please see <ph name="LINK_BEGIN">&lt;a href="chrome://os-settings/help"&gt;</ph>
About Brave OS<ph name="LINK_END">&lt;/a&gt;</ph>
</message>
<message name="IDS_SETTINGS_ABOUT_OS" desc="Menu title for the About Brave OS page.">
About Brave OS
</message>
<message name="IDS_SETTINGS_ABOUT_SEE_OS_SETTINGS_FOR_UPDATE_MESSAGE" desc="Message shown to users on Brave browser settings which alerts the user that OS updates are shown in Brave OS settings.">
To see if your device is up to date, go to <ph name="LINK_BEGIN">&lt;a href="chrome://os-settings/help"&gt;</ph>Brave OS Settings<ph name="LINK_END">&lt;/a&gt;</ph>
</message>
<message name="IDS_SETTINGS_GET_HELP_USING_CHROME_OS" desc="Text of the button which takes the user to the Brave help page.">
Get help with Brave OS
</message>
Expand Down
11 changes: 7 additions & 4 deletions app/settings_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,14 @@
<message name="IDS_SETTINGS_CAPTIONS_BACKGROUND_OPACITY" desc="Name of the caption background opacity preference.">
Background opacity
</message>
<message name="IDS_SETTINGS_CAPTIONS_OPACITY_MIN" desc="Value of the minimum captions text opacity setting.">
0
<message name="IDS_SETTINGS_CAPTIONS_OPACITY_OPAQUE" desc="Name of the opaque opacity preference.">
Opaque
</message>
<message name="IDS_SETTINGS_CAPTIONS_OPACITY_MAX" desc="Value of the maximum captions text opacity setting.">
100
<message name="IDS_SETTINGS_CAPTIONS_OPACITY_SEMI_TRANSPARENT" desc="Name of the semi-transparent opacity preference.">
Semi-transparent
</message>
<message name="IDS_SETTINGS_CAPTIONS_OPACITY_TRANSPARENT" desc="Name of the transparent opacity preference.">
Transparent
</message>
<message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW" desc="Name of the caption text shadow preference.">
Text shadow
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 02f4b3b1076568fa921ea5dd11ea564c7fb06796..c3900198d264ceda61027aa618e0c46ef8847acc 100644
index 149b97a0bd4e2d85b0efc97203e9c5d99fbb62a9..d0240cfd63d73f7523824649d51fd1e89c763764 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=78
MINOR=0
-BUILD=3904
-PATCH=50
-PATCH=70
+BUILD=70
+PATCH=119
4 changes: 2 additions & 2 deletions patches/chrome-android-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index ac52a743f73b7109f57df8f677518ca717812ba7..ff92fd9e070e290566ebfb401afc3b3a27ba353d 100644
index cb76914c7ca0268b2e39c0b50cfa5eccb65bf907..8e13c7540876cfad62400c69ae4f996334749c97 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -32,7 +32,7 @@ import("java_sources.gni")
Expand All @@ -19,7 +19,7 @@ index ac52a743f73b7109f57df8f677518ca717812ba7..ff92fd9e070e290566ebfb401afc3b3a
"//chrome/android/webapk/libs/common:splash_resources",
"//chrome/app:java_strings_grd",
"//chrome/browser/ui/android/widget:ui_widget_java_resources",
@@ -543,6 +544,7 @@ java_group("chrome_all_java") {
@@ -544,6 +545,7 @@ java_group("chrome_all_java") {
group("jni_headers") {
public_deps = [
":chrome_jni_headers",
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-android-java-res-values-dimens.xml.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
index 2fa76012e096cbf44c27e86da30ff641c5865710..4b8f88e4a51dd17b9317286f8bcbdf465fa8c952 100644
index 6ce0551695a4c3a823ffc4d1482a3bdbd1e0c66f..32ad9ede9c6276afd67b3517135b83261aca2648 100644
--- a/chrome/android/java/res/values/dimens.xml
+++ b/chrome/android/java/res/values/dimens.xml
@@ -309,7 +309,7 @@
@@ -308,7 +308,7 @@
<dimen name="modern_toolbar_background_size">40dp</dimen>
<!-- Sometimes the modern toolbar is shown at 48dp so a corner radius of
24dp is needed to completely round the corners. -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index 9de151eff10dd902d494e9d44419cf9138e365e9..9c10c231c53f707a146b0c0a381b739aa2421dd6 100644
index 0275c213018b897fcde045286f9b9416c070a6a8..f9021a9dc0f5b966834d93b6382c94fb53fdf958 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -179,7 +179,7 @@ import java.util.Locale;
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 38c89002e6bbc2bd07e7260624b148e9e1225c10..c310f381c05285399d672c110a0662b9370aae31 100644
index d730660c086f9a47d524708b2b477501e257bfaa..8f7b2e5019dde9ad232e128aca9b45f0475c5203 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2226,6 +2226,7 @@ jumbo_split_static_library("browser") {
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 3ceed0556297ef443366b303efd7f752c76a98ea..a59d7b4d0522a2ba1e9d66356d57cb0f2d5e9465 100644
index e608f06a232ab1acb64916806755caac1dcec607..d422a54c8696c3afdef13e223bf25c2697f0f2c9 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -280,14 +280,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
Expand Down
12 changes: 12 additions & 0 deletions patches/chrome-browser-android-chrome_feature_list.cc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
index bfeea2227a320b1580868a64875d7497b8455fdb..cee091d8c6f409febd66a3f4ec42fa3cebf2b24e 100644
--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
@@ -231,6 +231,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
};

const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
+ BRAVE_FIND_FEATURE_EXPOSED_TO_JAVA
for (size_t i = 0; i < base::size(kFeaturesExposedToJava); ++i) {
if (kFeaturesExposedToJava[i]->name == feature_name)
return kFeaturesExposedToJava[i];
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index 37972b557b457ffd69215caf8d2616432fe7a3da..9be4fa73fe51417bc5e8ed88517089a6d6f6592c 100644
index f079d9ff4dc0cd0805275ce3d94cadfad311b6f6..8097ca4fe149b4a477dd834196e63eb0646c188e 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -9,6 +9,8 @@
Expand All @@ -11,7 +11,7 @@ index 37972b557b457ffd69215caf8d2616432fe7a3da..9be4fa73fe51417bc5e8ed88517089a6
#include "build/build_config.h"
#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/browser_process.h"
@@ -92,11 +94,12 @@ bool ExtensionsDisabled(const base::CommandLine& command_line) {
@@ -90,11 +92,12 @@ bool ExtensionsDisabled(const base::CommandLine& command_line) {
ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {
AddAPIProvider(std::make_unique<CoreExtensionsBrowserAPIProvider>());
AddAPIProvider(std::make_unique<ChromeExtensionsBrowserAPIProvider>());
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-profiles-profile.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 28d3c597acc9e58bab439badb1d1dc9baa139048..4e4a3742f9133dcba49a2ec68a1181a345c5f63b 100644
index 56058d9ee424840d1b98ecfee42c656413c49542..029a4f72d1cf7fcf93044be8e1befff8bf92a766 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -140,7 +140,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-profiles-profile_impl.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 084648e9606f9847ff722901fb95626677a17c1e..0bcb822c794146ceec8c52c01da8c973fa25b808 100644
index 714af841142c924ed84cc5d2fb128ea42f1e47ec..0fd90d6b5b76b6a146626ded5f22a25ae83c3e16 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -34,6 +34,7 @@
Expand Down
10 changes: 5 additions & 5 deletions patches/chrome-browser-profiles-profile_manager.cc.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index bd2715738d89bc9a099d3be0614f720303b98086..0cd794e5c9b6d5dea803cc00b899524ba2ac75e6 100644
index 5fb5b84258a827cece9a0177096e564062a591be..4e3c24ebafdc6ad19ff623794f56924115e8cc48 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -1419,9 +1419,11 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
@@ -1407,9 +1407,11 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
const base::FilePath last_used_profile_path =
GetLastUsedProfileDir(user_data_dir_);
const base::FilePath guest_profile_path = GetGuestProfilePath();
Expand All @@ -14,23 +14,23 @@ index bd2715738d89bc9a099d3be0614f720303b98086..0cd794e5c9b6d5dea803cc00b899524b
last_used_profile != nullptr &&
!last_used_profile->IsLegacySupervised()) {
FinishDeletingProfile(profile_dir, last_used_profile_path);
@@ -1434,6 +1436,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
@@ -1422,6 +1424,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
base::FilePath cur_path = profile->GetPath();
if (cur_path != profile_dir &&
cur_path != guest_profile_path &&
+ cur_path != tor_profile_path &&
!profile->IsLegacySupervised() &&
!IsProfileDirectoryMarkedForDeletion(cur_path)) {
OnNewActiveProfileLoaded(profile_dir, cur_path, std::move(callback),
@@ -1453,6 +1456,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
@@ -1441,6 +1444,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
// legacy-supervised.
if (cur_path != profile_dir &&
cur_path != guest_profile_path &&
+ cur_path != tor_profile_path &&
!entry->IsLegacySupervised() &&
!IsProfileDirectoryMarkedForDeletion(cur_path)) {
fallback_profile_path = cur_path;
@@ -1867,6 +1871,7 @@ void ProfileManager::ScheduleForcedEphemeralProfileForDeletion(
@@ -1854,6 +1858,7 @@ void ProfileManager::ScheduleForcedEphemeralProfileForDeletion(
base::FilePath entry_path = entry->GetPath();
if (entry_path == profile_dir ||
entry_path == GetGuestProfilePath() ||
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chrome/browser/resources/settings/about_page/about_page.html
index 4571c6eea39c5c279c89f1621a6596e9676501e5..69bc8263a7626c62f4c8840e1bb40b544b3979ff 100644
index 99c0a1c19a17bcb93b4e180e629f0f786477a4f2..3a043b55610c14cb4eddd6282b3e83085b243814 100644
--- a/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chrome/browser/resources/settings/about_page/about_page.html
@@ -160,7 +160,7 @@
@@ -137,7 +137,7 @@
</div>
<a hidden$="[[!shouldShowLearnMoreLink_(
currentUpdateStatusEvent_)]]" target="_blank"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/about_page/about_page.js b/chrome/browser/resources/settings/about_page/about_page.js
index 6dff486f7ca396bb52b80b73205908421e233a29..ce007ca3b731900367c395c55d314b98d6f99e96 100644
index d4781a4d1b77d85f9a204bb1bb12d97ca7a31756..9cb9b41a4503f34ded883c0184a1f30e0145c8c0 100644
--- a/chrome/browser/resources/settings/about_page/about_page.js
+++ b/chrome/browser/resources/settings/about_page/about_page.js
@@ -355,7 +355,14 @@ Polymer({
@@ -347,7 +347,14 @@ Polymer({

/** @private */
onRelaunchTap_: function() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
index aa4d2b780b7f81b9b2442668c2cea96397c53ee0..a2842cab3e70eb95505eb91a96905fbdea56843f 100644
index 50af48baa09512246d62e6d780499f3e988dfc3f..dd6ef3c6eb1447ba92cf82c45bcc9af015ecd195 100644
--- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
@@ -449,6 +449,7 @@ bool SaveCardBubbleControllerImpl::ShouldShowSignInPromo() const {
@@ -462,6 +462,7 @@ bool SaveCardBubbleControllerImpl::ShouldShowSignInPromo() const {

const syncer::SyncService* sync_service =
ProfileSyncServiceFactory::GetForProfile(GetProfile());
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-ui-browser_navigator.cc.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 441d74eb9c66b5aca7b728e30ef42304ecac67d1..a32b1023f18a9b8138ebe2a580f4a5ea4f699816 100644
index f7e171b342cde5c6d2e321cb37bb9ce3635c118d..5fb4da522eca9b7bc852e5a173369315cede9f19 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -106,6 +106,7 @@ Browser* GetOrCreateBrowser(Profile* profile, bool user_gesture) {
@@ -108,6 +108,7 @@ Browser* GetOrCreateBrowser(Profile* profile, bool user_gesture) {
// Returns true on success. Otherwise, if changing params leads the browser into
// an erroneous state, returns false.
bool AdjustNavigateParamsForURL(NavigateParams* params) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index e97bcf25f13b25b2238f2f897892a59cea12cbf2..df1d72388124dd9d508cd9bd6dcfaec23c718da4 100644
index a0c3caad0b3af776341dcffea12ca2ea735a6886..7d408e9edfce2f0cfe6c91fcfe1782980483d3f8 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -15,6 +15,7 @@
Expand All @@ -10,7 +10,7 @@ index e97bcf25f13b25b2238f2f897892a59cea12cbf2..df1d72388124dd9d508cd9bd6dcfaec2
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/chrome_content_settings_utils.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
@@ -1676,7 +1677,7 @@ ContentSettingBubbleModel::CreateContentSettingBubbleModel(
@@ -1693,7 +1694,7 @@ ContentSettingBubbleModel::CreateContentSettingBubbleModel(
delegate, web_contents, content_type);
}
if (content_type == CONTENT_SETTINGS_TYPE_PLUGINS) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
index 7266999e9121d0c8b52bf9ebad6bfb30f747eeed..57bd53768fedf8c86cbdda690778e8939953c968 100644
index efbc68a2296666753fd5bf1ccf0cae8d52731b7d..91a63a7f529bd8e68787bb46605bab8abcdf61fd 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
@@ -133,7 +133,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
@@ -144,7 +144,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
source_language, target_language));
std::unique_ptr<TranslateBubbleModel> model(
new TranslateBubbleModelImpl(step, std::move(ui_delegate)));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.h b/chrome/browser/ui/views/translate/translate_bubble_view.h
index 92a60e4884bb34c3f1fd1ab7c7b50d85fcb3cd82..6fc0d4b14d48e540062c2ff388a08fd9766264b5 100644
index 2adf74e9eab0a431126c77b611b3d3938a6caaae..0c329a6336d811fb2aa4ef645339972fa16b8663 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view.h
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.h
@@ -123,6 +123,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,
@@ -125,6 +125,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,

// Returns the current view state.
TranslateBubbleModel::ViewState GetViewState() const;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
index 0c4646f48cd15e11a430ad7e6c465aa1cd973f50..5e6d258d8751ac68dac92d8eaaafe605ff7c1bac 100644
index 3ff5f45c78b4a7ca9fa8bc1f59f787fbe01b3792..09b896bef4082bc3ec1b67565944ebfc9e5c9e5f 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3407,6 +3407,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 03781c0b08e0157fd478f286b2a80c83d6495a53..e5c361bea59094a4fc71217de4367031a6757f6d 100644
index 6ad2480f3e26c5f64f32f332e391b5575785e10b..4f7332cde8610cd62a0eb3def458e7b7e746957a 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -22,6 +22,7 @@
Expand All @@ -10,7 +10,7 @@ index 03781c0b08e0157fd478f286b2a80c83d6495a53..e5c361bea59094a4fc71217de4367031
#include "chrome/common/buildflags.h"
#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_content_client.h"
@@ -462,7 +463,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
@@ -463,7 +464,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
bool should_whitelist_for_content_settings =
base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kInstantProcess);
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-test-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index a08aa22bb990b32aa73d3c0f6783575d539f7423..35287d9997379ffba7afabfe04a8707c0e2a06cb 100644
index 86ad48852953f05cec32c7a2a6286ffb378b5af2..d40fb830723a6e89990afda51717af12629e3a45 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -721,6 +721,7 @@ if (!is_android) {
@@ -722,6 +722,7 @@ if (!is_android) {
"//v8",
]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index b60c49a9da0319d00419ffd333eb04089130b689..3eeced51900fba32d64c046c2612e9bce452a1f6 100644
index b60c49a9da0319d00419ffd333eb04089130b689..3433185439598cd65c840af2e2e95bd9f6774cf4 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -505,6 +505,7 @@ void ContentSettingsRegistry::Init() {
Expand Down
2 changes: 1 addition & 1 deletion patches/components-gcm_driver-gcm_client_impl.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc
index f6a6a35e98087ac56f39dd40e0ee3169f5865e88..d7e7fded33b44eeb15b0a559d9385457c65350d4 100644
index 9c72a7f42918f85d9ff89e5580fac90f09cdf521..7eafc8a06c8ba2545178bd6c7a280e0b1e30fdce 100644
--- a/components/gcm_driver/gcm_client_impl.cc
+++ b/components/gcm_driver/gcm_client_impl.cc
@@ -323,6 +323,7 @@ void GCMClientImpl::Initialize(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 67ce9117a121ceb3127db83319a158dcfaad86cb..cf2a32cc2fe7ef3bd8d41b0e4d672e905586e3aa 100644
index 35381afde314edfad67ad6da4fe7e32111402adf..018eb435968e9e2b812890aa89693b4b449d275a 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -1987,6 +1987,7 @@ void NavigationRequest::OnStartChecksComplete(
@@ -2015,6 +2015,7 @@ void NavigationRequest::OnStartChecksComplete(
headers.MergeFrom(TakeModifiedRequestHeaders());
begin_params_->headers = headers.ToString();

Expand Down
Loading