Add oom tab killing and the about:discards page on linux

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index cbda95301c25b3331caf6de9bc3c4644934c6601..9310fd53e4cb1c4f474749e1d5c9d59b4941754f 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7031,7 +7031,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Enable the new task manager.
         </message>
         <message name="IDS_FLAGS_ENABLE_NEW_TASK_MANAGER_DESCRIPTION" desc="Description of the flag to enable the new implementation of the task manager.">
-          Enables the use of the new and optimized implementation of the chrome task manager. 
+          Enables the use of the new and optimized implementation of the chrome task manager.
         </message>
       </if>
 
@@ -15816,7 +15816,7 @@ After you create a new supervised user, you can manage their settings at any tim
         Do you want <ph name="PASSWORD_MANAGER_BRAND">$1<ex>Google Chrome</ex></ph> to save your password for <ph name="ORIGIN">$2<ex>example.com</ex></ph>?
       </message>
 
-    <if expr="is_win">
+    <if expr="is_win or is_linux">
       <!-- Tab discarding -->
       <message name="IDS_FLAGS_ENABLE_TAB_DISCARDING_NAME" desc="Name for the flag to enable tab discarding.">
         Enable tab discarding