Merge pull request #395 from brave/70.0.3538.6

Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10

Author: bbondy

app/brave_main_delegate.cc

@@ -50,9 +50,13 @@ BraveMainDelegate::CreateContentBrowserClient() {
 #else
   if (chrome_content_browser_client_ == nullptr) {
     DCHECK(service_manifest_data_pack_);
+    DCHECK(service_manifest_data_pack_);
+    DCHECK(!chrome_feature_list_creator_);
+    chrome_feature_list_creator_ = std::make_unique<ChromeFeatureListCreator>();
     chrome_content_browser_client_ =
         std::make_unique<BraveContentBrowserClient>(
-            std::move(service_manifest_data_pack_));
+            std::move(service_manifest_data_pack_),
+            chrome_feature_list_creator_.get());
   }
   return chrome_content_browser_client_.get();
 #endif

app/brave_strings.grd

@@ -216,7 +216,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
           Brave OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_CROS_OSS">&lt;/a&gt;</ph>.
         </message>
         <message name="IDS_ABOUT_CROS_WITH_LINUX_VERSION_LICENSE" desc="Additional text displayed beneath the Brave open source URLs for Brave OS when Crostini is installed.">
-          Brave OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_CROS_OSS">&lt;/a&gt;</ph>, as is Linux (Beta).
+          Brave OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_CROS_OSS">&lt;/a&gt;</ph>, as is <ph name="BEGIN_LINK_LINUX_OSS">&lt;a target="_blank" href="$2"&gt;</ph>Linux (Beta)<ph name="END_LINK_LINUX_OSS">&lt;/a&gt;</ph>.
         </message>
       </if>
       <message name="IDS_ABOUT_TERMS_OF_SERVICE" desc="The terms of service label in the About box." translateable="false">

app/generated_resources.grd

@@ -1828,6 +1828,18 @@ are declared in tools/grit/grit_rule.gni.
         </message>
       </if>
 
+      <!-- "Uninstall web app" menu item -->
+      <if expr="use_titlecase">
+        <message name="IDS_UNINSTALL_FROM_OS_LAUNCH_SURFACE" desc="In Title Case: Menu text for uninstalling a web app from the operating system.">
+          Uninstall <ph name="APP">$1<ex>Gmail</ex></ph>...
+        </message>
+      </if>
+      <if expr="not use_titlecase">
+        <message name="IDS_UNINSTALL_FROM_OS_LAUNCH_SURFACE" desc="Menu text for uninstalling a web app from the operating system.">
+          Uninstall <ph name="APP">$1<ex>Gmail</ex></ph>...
+        </message>
+      </if>
+
       <!-- "Application Information" dialog -->
       <if expr="not use_titlecase">
         <message name="IDS_APPLICATION_INFO_WEB_STORE_LINK" desc="Text for the link that opens the app or extension in the Web Store..">
@@ -3035,6 +3047,9 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_UTILITY_PROCESS_CUPS_IPP_VALIDATOR_SERVICE_NAME" desc="The name of the utility process used for validating IPP requests out-of-process.">
           CUPS IPP Validator
         </message>
+        <message name="IDS_UTILITY_PROCESS_IME_SERVICE_NAME" desc="The name of the utility process providing the input methods.">
+          Brave OS Input Method
+        </message>
       </if>
       <message name="IDS_UTILITY_PROCESS_FILE_UTILITY_NAME" desc="The name of the utility process used for various Brave specific file operations.">
           Brave File Utilities
@@ -3327,6 +3342,9 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_EXTENSION_PROMPT_WARNING_DOCUMENT_SCAN" desc="Permission string for access to document scanning.">
           Access document scanners attached via USB or on the local network
         </message>
+        <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_HARDWARE_PLATFORM" desc="Permission string for access to hardware platform information.">
+          Read the manufacturer and model of this computer
+        </message>
         <message name="IDS_EXTENSION_PROMPT_WARNING_FAVICON" desc="Permission string for access to favicons.">
           Read the icons of the websites you visit
         </message>
@@ -3702,12 +3720,18 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_EXTENSIONS_LOAD_ERROR_MESSAGE" desc="The message which tells the user that an extension failed to load.">
           Failed to load extension from:
         </message>
+        <message name="IDS_EXTENSIONS_WANTS_ACCESS_TO_SITE" desc="The message shown on mouseover when an extension wants to run on a specific site.">
+          Wants access to this site
+        </message>
+        <message name="IDS_EXTENSIONS_HAS_ACCESS_TO_SITE" desc="The message shown on mouseover when an extension currently can run on a specific site.">
+          Has access to this site
+        </message>
         <if expr="not use_titlecase">
           <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS" desc="The label in an extension's context menu for the submenu specifying whether or not the extension can run on the current page (sentence case).">
-            Allow access
+            This can read and change site data
           </message>
           <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_CLICK" desc="The label in an extension's context menu to allow the extension access to the page only when the user clicks on the extension action (sentence case).">
-            On click
+            When you click the extension
           </message>
           <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_SITE" desc="The label in an extension's context menu to always allow the extension access to the current origin (sentence case).">
             On <ph name="ORIGIN">$1<ex>google.com</ex></ph>
@@ -3742,10 +3766,10 @@ are declared in tools/grit/grit_rule.gni.
         </if>
         <if expr="use_titlecase">
           <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS" desc="The label in an extension's context menu for the submenu specifying whether or not the extension can run on the current page (title case).">
-            Allow Access
+            This Can Read and Change Site Data
           </message>
           <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_CLICK" desc="The label in an extension's context menu to allow the extension access to the page only when the user clicks on the extension action (title case).">
-            On Click
+            When You Click the Extension
           </message>
           <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_SITE" desc="The label in an extension's context menu to always allow the extension access to the current origin (title case).">
             On <ph name="ORIGIN">$1<ex>google.com</ex></ph>
@@ -4252,8 +4276,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_WEBRTC_LOGS_TITLE" desc="Title for the chrome://webrtc-logs page.">
         WebRTC logs
       </message>
-      <message name="IDS_WEBRTC_LOGS_LOG_COUNT_BANNER_FORMAT" desc="Format for WebRTC log count banner on chrome://webrtc-logs">
-        WebRTC logs (<ph name="WEBRTC_LOG_COUNT">$1<ex>3</ex></ph>)
+      <message name="IDS_WEBRTC_TEXT_LOGS_LOG_COUNT_BANNER_FORMAT" desc="Format for WebRTC text log count banner on chrome://webrtc-logs">
+        WebRTC text logs (<ph name="WEBRTC_TEXT_LOG_COUNT">$1<ex>3</ex></ph>)
+      </message>
+      <message name="IDS_WEBRTC_EVENT_LOGS_LOG_COUNT_BANNER_FORMAT" desc="Format for WebRTC event log count banner on chrome://webrtc-logs">
+        WebRTC event logs (<ph name="WEBRTC_EVENT_LOG_COUNT">$1<ex>3</ex></ph>)
       </message>
       <message name="IDS_WEBRTC_LOGS_LOG_HEADER_FORMAT" desc="Format for uploaded log entry headings on chrome://webrtc-logs">
         WebRTC log captured <ph name="WEBRTC_LOG_CAPTURE_TIME">$1<ex>Tuesday, January 25, 2011 2:58:02 PM</ex></ph>
@@ -4267,17 +4294,32 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_WEBRTC_LOGS_LOG_UPLOAD_TIME_FORMAT" desc="Format for uploaded log entry upload time on chrome://webrtc-logs">
         Uploaded <ph name="WEBRTC_LOG_UPLOAD_TIME">$1<ex>Tuesday, January 25, 2011 2:58:02 PM</ex></ph>
       </message>
-      <message name="IDS_WEBRTC_LOGS_LOG_REPORT_ID_FORMAT" desc="Format for uploaded log entry report ID on chrome://webrtc-logs">
+      <message name="IDS_WEBRTC_LOGS_LOG_FAILED_UPLOAD_TIME_FORMAT" desc="Format for a log's failed upload attempt entry on chrome://webrtc-logs">
+        Upload failed (<ph name="WEBRTC_LOG_UPLOAD_TIME">$1<ex>Tuesday, January 25, 2011 2:58:02 PM</ex></ph>).
+      </message>
+      <message name="IDS_WEBRTC_LOGS_LOG_REPORT_ID_FORMAT" desc="Format for uploaded log entry report ID on chrome://webrtc-logs. This is the ID on the server to which the log was uploaded.">
         Report ID <ph name="WEBRTC_LOG_REPORT_ID">$1<ex>8fa95dbb6f2ec862</ex></ph>
       </message>
       <message name="IDS_WEBRTC_LOGS_BUG_LINK_LABEL" desc="Link text for filing a bug on chrome://webrtc-logs">
         File bug
       </message>
+      <message name="IDS_WEBRTC_LOGS_LOG_PENDING_MESSAGE" desc="The explanatory message for chrome://webrtc-logs when the log is still pending upload.">
+        Log upload pending.
+      </message>
+      <message name="IDS_WEBRTC_LOGS_LOG_ACTIVELY_UPLOADED_MESSAGE" desc="The explanatory message for chrome://webrtc-logs when the log is currently being uploaded.">
+        Log upload underway.
+      </message>
       <message name="IDS_WEBRTC_LOGS_LOG_NOT_UPLOADED_MESSAGE" desc="The explanatory message for chrome://webrtc-logs when the log has not been uploaded">
         Log not uploaded.
       </message>
-      <message name="IDS_WEBRTC_LOGS_NO_LOGS_MESSAGE" desc="The explanatory message for chrome://webrtc-logs when there are no captured logs">
-        You have no recently captured WebRTC logs.
+      <message name="IDS_WEBRTC_LOGS_EVENT_LOG_LOCAL_LOG_ID" desc="The ID of the log. This ID is assigned even if the log is not uploaded.">
+        Local log ID: <ph name="WEBRTC_EVENT_LOG_LOCAL_ID">$1<ex>A83BC19927509874309F2EE002174235</ex></ph>.
+      </message>
+      <message name="IDS_WEBRTC_LOGS_NO_TEXT_LOGS_MESSAGE" desc="The explanatory message for chrome://webrtc-logs when there are no captured text logs">
+        You have no recently captured WebRTC text logs.
+      </message>
+      <message name="IDS_WEBRTC_LOGS_NO_EVENT_LOGS_MESSAGE" desc="The explanatory message for chrome://webrtc-logs when there are no captured event logs">
+        You have no recently captured WebRTC event logs.
       </message>
 
       <!-- Plugin placeholders -->
@@ -4573,6 +4615,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_NTP_CUSTOM_LINKS_CANT_CREATE" desc="A catchall error message for when the shortcut cannot be created. (On the New Tab Page)">
        Can’t create shortcut
       </message>
+      <message name="IDS_NTP_CUSTOM_LINKS_CANT_EDIT" desc="A catchall error message for when the shortcut cannot be edited. (On the New Tab Page)">
+       Can’t edit shortcut
+      </message>
+      <message name="IDS_NTP_CUSTOM_LINKS_CANT_REMOVE" desc="A catchall error message for when the shortcut cannot be removed. (On the New Tab Page)">
+       Can’t remove shortcut
+      </message>
       <message name="IDS_NTP_CONFIRM_MSG_SHORTCUT_REMOVED" desc="The title of the shortcut removed confirmation message when removing a custom link. (On the New Tab Page)">
         Shortcut removed
       </message>

app/resources/chromium_strings_am.xtb

@@ -18,7 +18,6 @@
 <translation id="8992261409816268381">የBrave ደራሲዎች</translation>
 <translation id="4651430425715739110">የቅጂ መብት <ph name="YEAR"/> የBrave ደራሲያን። ሁሉም መብቶች የተጠበቁ ናቸው።</translation>
 <translation id="2310890394934209120">Brave ስርዓተ ክወና በተጨማሪ <ph name="BEGIN_LINK_CROS_OSS"/>ክፍት ምንጭ ሶፍትዌር<ph name="END_LINK_CROS_OSS"/> እውን ሊሆን ችሏል።</translation>
-<translation id="858647341154864560">Brave OS በተጨማሪ <ph name="BEGIN_LINK_CROS_OSS"/>ክፍት ምንጭ ሶፍትዌር<ph name="END_LINK_CROS_OSS"/> እንደ Linux (ቅድመ ይሁንታ) እንደሆነው ሊሆን የሚችል ሆኗል።</translation>
 <translation id="5019879183386042809">Brave ነባሪውን አሳሽ ያድርጉ።</translation>
 <translation id="5063987220091207247">Brave OS ይህን ገጽ መክፈት አይችልም።</translation>
 <translation id="4065288863231444640">Brave በበስተጀርባ ላይ ያሂድ</translation>
@@ -38,6 +37,7 @@ Brave ቅንብሮችዎን ማስመለስ አልቻለም።</translation>
 <translation id="5785919770853225148">Brave ይህን የይለፍ ቃል በእርስዎ የBrave Software መለያ ውስጥ ያስቀምጠዋል። ማስታወስ አይኖርብዎትም።</translation>
 <translation id="3343095737966473035">Brave ነባሪ አሳሽዎ አይደለም</translation>
 <translation id="6715663530666325392">ግላዊነት የተላበሰው የአሳሽ ባህሪዎችዎ ድር ላይ ለማስቀመጥና ከዚያ Brave ካለው ማንኛውም ኮምፒውተር ለመድረስ አመሳስልን ያዋቅሩ።</translation>
+<translation id="5874882355102994015">አብሮገነቡ የፒዲኤፍ መመልከቻው ከጎደለ Brave የህትመት ቅድመ-እይታውን ማሳየት አይችልም።</translation>
 <translation id="8880183781256147665">ወደ Brave በማከል ላይ...</translation>
 <translation id="3561569806301739367"><ph name="FILE_NAME"/> አደገኛ ሊሆን ስለሚችል Brave አግዶታል።</translation>
 <translation id="9067428552314418522">ይህ ፋይል አደገኛ ስለሆነ Brave አግዶታል።</translation>

app/resources/chromium_strings_ar.xtb

@@ -18,7 +18,6 @@
 <translation id="8992261409816268381">The Brave Authors</translation>
 <translation id="4651430425715739110">‏حقوق الطبع والنشر لعام <ph name="YEAR"/> لصالح The Brave Authors. جميع الحقوق محفوظة.</translation>
 <translation id="2310890394934209120">‏أصبح نظام التشغيل Brave متاحًا من خلال المزيد من <ph name="BEGIN_LINK_CROS_OSS"/>البرامج مفتوحة المصدر<ph name="END_LINK_CROS_OSS"/>.</translation>
-<translation id="858647341154864560">‏أصبح نظام التشغيل Brave متاحًا من خلال <ph name="BEGIN_LINK_CROS_OSS"/>برنامج مفتوح المصدر<ph name="END_LINK_CROS_OSS"/> إضافي، كما في نظام التشغيل Linux (إصدار تجريبي).</translation>
 <translation id="5019879183386042809">‏جعل Brave المتصفح التلقائي</translation>
 <translation id="5063987220091207247">‏يتعذر على نظام التشغيل Brave فتح هذه الصفحة.</translation>
 <translation id="4065288863231444640">‏السماح بتشغيل Brave في الخلفية</translation>
@@ -36,6 +35,7 @@
 <translation id="5785919770853225148">‏سيحفظ Brave كلمة المرور هذه في حسابك على Brave Software ولن تحتاج تذكّرها.</translation>
 <translation id="3343095737966473035">‏Brave ليس متصفحك التلقائي.</translation>
 <translation id="6715663530666325392">‏يمكنك إعداد المزامنة لحفظ ميزات المتصفح المخصصة على الويب والدخول إليها من Brave على أي كمبيوتر.</translation>
+<translation id="5874882355102994015">‏يتعذر على Brave عرض معاينة الطباعة عندما يكون عارض PDF المضمّن مفقودًا.</translation>
 <translation id="8880183781256147665">‏جارٍ الإضافة إلى Brave...</translation>
 <translation id="3561569806301739367">‏قد يكون ملف <ph name="FILE_NAME"/> ضارًا، لذلك فقد حظره Brave.</translation>
 <translation id="9067428552314418522">‏هذا الملف ضار، لذلك فقد حظره Brave.</translation>

app/resources/chromium_strings_bg.xtb

@@ -18,7 +18,6 @@
 <translation id="8992261409816268381">Авторите на Brave</translation>
 <translation id="4651430425715739110">Авторски права <ph name="YEAR"/> Авторите на Brave. Всички права запазени.</translation>
 <translation id="2310890394934209120">Brave OS е възможна благодарение на допълнителен <ph name="BEGIN_LINK_CROS_OSS"/>софтуер с отворен код<ph name="END_LINK_CROS_OSS"/>.</translation>
-<translation id="858647341154864560">Brave OS е възможна благодарение на допълнителен <ph name="BEGIN_LINK_CROS_OSS"/>софтуер с отворен код<ph name="END_LINK_CROS_OSS"/>. Това се отнася и за Linux (бета).</translation>
 <translation id="5019879183386042809">Нека Brave да е браузърът по подразбиране</translation>
 <translation id="5063987220091207247">Brave OS не може да отвори тази страница.</translation>
 <translation id="4065288863231444640">Разрешаване на Brave да се изпълнява на заден план</translation>
@@ -30,6 +29,7 @@
 <translation id="5785919770853225148">Brave ще запази тази парола в профила ви в Brave Software. Няма да се налага да я помните.</translation>
 <translation id="3343095737966473035">Brave не е браузърът ви по подразбиране</translation>
 <translation id="6715663530666325392">Настройте синхронизирането, за да запазите онлайн персонализираните функции на браузъра си и да осъществявате достъп до тях от Brave на всеки компютър.</translation>
+<translation id="5874882355102994015">Brave не може да покаже визуализацията за печат, когато вграденият визуализатор на PDF файлове липсва.</translation>
 <translation id="8880183781256147665">Добавя се към Brave...</translation>
 <translation id="3561569806301739367">Brave блокира „<ph name="FILE_NAME"/>“, тъй като файлът може да е опасен.</translation>
 <translation id="9067428552314418522">Brave блокира този файл, тъй като е опасен.</translation>