BASELINE: Update Chromium to 61.0.3163.99

Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 16 insertions, 24 deletions

diff --git a/chromium/chrome/app/google_chrome_strings.grd b/chromium/chrome/app/google_chrome_strings.grd
index 990ec61bc1a..f2d4eff5675 100644
--- a/chromium/chrome/app/google_chrome_strings.grd
+++ b/chromium/chrome/app/google_chrome_strings.grd
@@ -301,12 +301,6 @@ chromium_strings.grd. -->
           Google Chrome OS can't open this page.
         </message>
       </if>
-      <!-- Strings used to warn that an OS is not supported -->
-      <if expr="is_win">
-        <message name="IDS_UNSUPPORTED_OS_PRE_WIN_XP" desc="The text used to warn the user that Windows pre-XP is not supported">
-          Google Chrome requires Windows XP or later. Some features may not work.
-        </message>
-      </if>
       <if expr="not chromeos">
         <message name="IDS_OPTIONS_RELAUNCH_REQUIRED" desc="The message displayed for an option that requires a relaunch to take effect. This appears in a message box if an option is changed that requires a relaunch.">
           Please close all Google Chrome windows and relaunch it for this change to take effect.
@@ -761,6 +755,15 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth
         </message>
       </if>
 
+      <if expr="toolkit_views">
+        <message name="IDS_ENTERPRISE_FORCE_SIGNOUT_EXPLANATION" desc="Text of the reason to sign out">
+          Authentication certificate failed. Please sign in to Google Chrome again as <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph> or contact your administrator for more information. <ph name="ADDITIONAL_EXPLANATION">$2</ph>
+        </message>
+        <message name="IDS_ENTERPRISE_FORCE_SIGNOUT_EXPLANATION_WITHOUT_USER_NAME" desc="Text of the reason to sign out when there is no valid email address">
+          Authentication certificate failed. Please sign in to Google Chrome again or contact your administrator for more information. <ph name="ADDITIONAL_EXPLANATION">$2</ph>
+      </message>
+      </if>
+
       <!-- Signin Email Confirmation tab modal dialog -->
       <if expr="not chromeos">
         <message name="IDS_SIGNIN_EMAIL_CONFIRMATION_TITLE" desc="Title of the signin email confirmation tab modal dialog.">
@@ -954,21 +957,8 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
         </message>
 
         <!-- User pod remove sync warning text -->
-        <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC" desc="Main text shown as a warning when attempting to remove an user. This case is for synced profiles, with all statistics loaded correctly. The symbol $1 will be substituted with custom JS code, so it should not be replaced by a #.">
-          {NUM_ITEMS, plural,
-          =1 {This will permanently delete $1 item from this device. To retrieve your data later, sign in to Chrome as $2.}
-          other {This will permanently delete $1 items from this device. To retrieve your data later, sign in to Chrome as $2.}}
-        </message>
-        <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC_WITH_ERRORS" desc="Main text shown as a warning when attempting to remove an user. This case is for non-synced profiles, with some statistics failed to load. The symbol $1 will be substituted with custom JS code, so it should not be replaced by a #.">
-          {NUM_ITEMS, plural,
-          =1 {This will permanently delete at least $1 item from this device. To retrieve your data later, sign in to Chrome as $2.}
-          other {This will permanently delete at least $1 items from this device. To retrieve your data later, sign in to Chrome as $2.}}
-        </message>
-        <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC_NOSTATS" desc="Main text shown as a warning when attempting to remove an user. This case is for synced profiles with statistics unavailable. (Possible case: Chrome decided not to load the statistics of closed profiles.)">
-          This will permanently delete your browsing data from this device. To retrieve your data later, sign in to Chrome as $2.
-        </message>
-        <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC_CALCULATING" desc="Main text shown as a warning when attempting to remove an user. This case is for synced profiles when the statistics is still loading. $1 is always replaced by localized version of the ellipsis (...).">
-          This will permanently delete at least <ph name="TOTAL_COUNT">$1<ex>...</ex></ph> items from this device. To retrieve your data later, sign in to Chrome as $2.
+        <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC" desc="Main text shown as a warning when attempting to remove an user.">
+          This person's browsing data will be deleted from this device. To recover the data, sign in to Chrome as $2.
         </message>
 
         <!-- Tutorial -->
@@ -1193,9 +1183,11 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
       </message>
 
       <!-- Plugin Placeholders -->
-      <message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted.">
-        Restart Chrome to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>
-      </message>
+      <if expr="is_linux">
+        <message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted.">
+          Restart Chrome to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>
+        </message>
+      </if>
 
       <!-- Desktop to iOS promotion -->
       <message name="IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TEXT" desc="Text for Chrome iOS Promotion appearing in the password bubble after a password is saved.">