Merge pull request #5190 from brave/1.8.x-c81

Upgrade patches from Chromium 81.0.4044.83 to Chromium 81.0.4044.92 (uplift to 1.8.x)
brave · Apr 9, 2020 · 5c04843 · 5c04843
2 parents 6afaed2 + db3f024
commit 5c04843
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index e17f5cb3fffab9fb2c246706ee222fd0b2f65203..111f7b84d2bc7f8f4e8ebb4badc49b18c9b7501a 100644
+index 877fb3c871cd057dea9ba32719ae4c2e7e395715..52d3af65ff976d03ddf56253b85bcbbd9970b208 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=81
 -MINOR=0
 -BUILD=4044
--PATCH=83
+-PATCH=92
 +MINOR=1
 +BUILD=8
 +PATCH=70
diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 7b1f6db1f1e71ad52117bd9b2587374e2ec37701..5def8351330a1926ab6de41d03fe97fa592c0b5a 100644
+index f72729682998783a3714e3b2618c3265850b72e6..48f8316a008467902ac022f218713ef8cf504671 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -288,14 +288,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
@@ -21,7 +21,7 @@ index 7b1f6db1f1e71ad52117bd9b2587374e2ec37701..5def8351330a1926ab6de41d03fe97fa
 
  const FeatureEntry::Choice kPassiveListenersChoices[] = {
      {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -4930,6 +4930,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4934,6 +4934,7 @@ const FeatureEntry kFeatureEntries[] = {
      // Histograms" in tools/metrics/histograms/README.md (run the
      // AboutFlagsHistogramTest unit test to verify this process).
 

diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
-index 5c68984920dea55c3ca2339319c9febb8a1038d5..80b59016b538b34af32ed0fae1f443c1c7f517c0 100644
+index e6fe22c10e38b6d65a190c3331ee94ff4d1dd3f2..4dfd87c8c22e3379bef99546f78176e763f987f1 100644
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
 @@ -17,6 +17,7 @@
@@ -10,7 +10,7 @@ index 5c68984920dea55c3ca2339319c9febb8a1038d5..80b59016b538b34af32ed0fae1f443c1
  #include "chrome/browser/extensions/extension_management_constants.h"
  #include "chrome/browser/extensions/extension_management_internal.h"
  #include "chrome/browser/extensions/external_policy_loader.h"
-@@ -670,7 +671,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor(
+@@ -672,7 +673,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor(
      content::BrowserContext* context) const {
    TRACE_EVENT0("browser,startup",
                 "ExtensionManagementFactory::BuildServiceInstanceFor");

diff --git a/patches/chrome-browser-extensions-extension_management.h.patch b/patches/chrome-browser-extensions-extension_management.h.patch
@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h
-index 731bc04140d35b986885d5dc21e9578ec520eb36..909b275d6c7ffec33af0f6f3677425d106e63916 100644
+index 49deccc26c3a0a3d051992dbf9b36623b725445a..328b2a9e9488b25de2c739d26ed3dc69e9b38990 100644
 --- a/chrome/browser/extensions/extension_management.h
 +++ b/chrome/browser/extensions/extension_management.h
-@@ -182,6 +182,7 @@ class ExtensionManagement : public KeyedService {
-                            std::string* required_version) const;
+@@ -185,6 +185,7 @@ class ExtensionManagement : public KeyedService {
+   bool is_child() const { return is_child_; }
 
   private:
 +  friend class BraveExtensionManagement;

diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
-index c17294bae79e376300511d0e5759bae45deb553d..d53fca058a123d94d47bab379982932e447878ab 100644
+index e58a616706e4bce249a36134c7bf2c43478bfe89..950c42e7c9a638e8afe5898a1ebeb1c916faa7d4 100644
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -188590,6 +188590,7 @@ regressions. -->
+@@ -188603,6 +188603,7 @@ regressions. -->
    <suffix name="ProtectedMedia" label="Protected media permission"/>
    <suffix name="PushMessaging" label="Push messaging permission"/>
    <suffix name="Quota" label="Quota permission"/>