Merge pull request #656 from brave/69.0.3497.12

Upgrade to Chromium 69.0.3497.12

Author: bbondy

lib/l10nUtil.js

@@ -42,6 +42,10 @@ const chromiumMdExtensionsPartPath = path.resolve(path.join(srcDir, 'chrome', 'a
 const braveMdExtensionsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'md_extensions_strings.grdp'))
 const chromiumPrintingStringsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'printing_strings.grdp'))
 const bravePrintingStringsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'printing_strings.grdp'))
+const chromiumProfileSettingsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'profiles_strings.grdp'))
+const braveProfileSettingsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'profiles_strings.grdp'))
+const chromiumVRStringsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'vr_strings.grdp'))
+const braveVRStringsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'vr_strings.grdp'))
 
 // extensions_resources.grd and any of its parts files that we track localization for in transifex
 // There are no XTB files for this.
@@ -83,6 +87,8 @@ const chromiumToAutoGeneratedBraveMapping = {
   [chromiumSettingsStringsPartPath]: braveSettingsStringsPartPath,
   [chromiumMdExtensionsPartPath]: braveMdExtensionsPartPath,
   [chromiumPrintingStringsPartPath]: bravePrintingStringsPartPath,
+  [chromiumProfileSettingsPartPath]: braveProfileSettingsPartPath,
+  [chromiumVRStringsPartPath]: braveVRStringsPartPath,
   [chromiumExtensionsResourcesPath]: braveExtensionsResourcesPath,
   [chromiumSettingsResourcesPath]: braveSettingsResourcesPath,
   [chromiumBrowserResourcesPath]: braveBrowserResourcesPath

package.json

@@ -21,7 +21,7 @@
     "projects": {
       "chrome": {
         "dir": "src",
-        "tag": "68.0.3440.68",
+        "tag": "69.0.3497.12",
         "repository": {
           "url": "https://chromium.googlesource.com/chromium/src.git"
         },