Wrap some PPAPI GRD entries in an enable_plugins conditional.

Effectively removing them from Android, where there is no PPAPI. Also
fix an "is_chromeos" typo.

Change-Id: I1395ccf368c1d0f593352d1ae2755fcb5920468a
Reviewed-on: https://chromium-review.googlesource.com/1140531Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575885}

chrome/app/generated_resources.grd

@@ -4508,46 +4508,41 @@ Keep your key file in a safe place. You will need it to create new versions of y
       </message>
 
       <!-- Pepper Broker Infobar -->
-      <if expr="is_android">
-        <message name="IDS_PEPPER_BROKER_MESSAGE" desc="Mobile: Message shown when a pepper plugin wants to launch its broker. This message is followed by a 'Learn more' link.">
-          <ph name="PEPPER_PLUGIN_NAME">$1<ex>Flash</ex></ph> on <ph name="PEPPER_PLUGIN_DOMAIN">$2<ex>example.com</ex></ph> wants to access your device
-        </message>
-      </if>
-      <if expr="not is_android">
+      <if expr="enable_plugins">
         <message name="IDS_PEPPER_BROKER_MESSAGE" desc="Message shown when a pepper plugin wants to launch its broker. This message is followed by a 'Learn more' link.">
           <ph name="PEPPER_PLUGIN_NAME">$1<ex>Flash</ex></ph> on <ph name="PEPPER_PLUGIN_DOMAIN">$2<ex>example.com</ex></ph> wants to access your computer
         </message>
+        <message name="IDS_PEPPER_BROKER_ALLOW_BUTTON" desc="Text for the allow button on the pepper broker launch prompt">
+          Allow
+        </message>
+        <message name="IDS_PEPPER_BROKER_DENY_BUTTON" desc="Text for the deny button on the pepper broker launch prompt">
+          Deny
+        </message>
+        <message name="IDS_BLOCKED_PPAPI_BROKER_TITLE" desc="Title for the page action when Pepper sandbox access was blocked.">
+          Unsandboxed plugin blocked
+        </message>
+        <message name="IDS_ALLOWED_PPAPI_BROKER_TITLE" desc="Title for the page action when Pepper sandbox access was allowed.">
+          Unsandboxed plugin allowed
+        </message>
+        <message name="IDS_BLOCKED_PPAPI_BROKER_MESSAGE" desc="Message for the page action when Pepper broker access was blocked">
+          An unsandboxed plugin was prevented from running on this page.
+        </message>
+        <message name="IDS_ALLOWED_PPAPI_BROKER_MESSAGE" desc="Message for the page action when Pepper broker access was allowed">
+          An unsandboxed plugin was allowed to run on this page.
+        </message>
+        <message name="IDS_BLOCKED_PPAPI_BROKER_UNBLOCK" desc="Radio button to unblock the Pepper broker">
+          Always allow unsandboxed plugins on <ph name="HOST">$1<ex>example.com</ex></ph>
+        </message>
+        <message name="IDS_BLOCKED_PPAPI_BROKER_NO_ACTION" desc="Radio button to keep blocking the Pepper broker">
+          Continue blocking unsandboxed plugins
+        </message>
+        <message name="IDS_ALLOWED_PPAPI_BROKER_NO_ACTION" desc="Radio button to keep allowing the Pepper broker">
+          Continue allowing unsandboxed plugins
+        </message>
+        <message name="IDS_ALLOWED_PPAPI_BROKER_BLOCK" desc="Radio button to block the Pepper broker">
+          Always block unsandboxed plugins on <ph name="HOST">$1<ex>example.com</ex></ph>
+        </message>
       </if>
-      <message name="IDS_PEPPER_BROKER_ALLOW_BUTTON" desc="Text for the allow button on the pepper broker launch prompt">
-        Allow
-      </message>
-      <message name="IDS_PEPPER_BROKER_DENY_BUTTON" desc="Text for the deny button on the pepper broker launch prompt">
-        Deny
-      </message>
-      <message name="IDS_BLOCKED_PPAPI_BROKER_TITLE" desc="Title for the page action when Pepper sandbox access was blocked.">
-        Unsandboxed plugin blocked
-      </message>
-      <message name="IDS_ALLOWED_PPAPI_BROKER_TITLE" desc="Title for the page action when Pepper sandbox access was allowed.">
-        Unsandboxed plugin allowed
-      </message>
-      <message name="IDS_BLOCKED_PPAPI_BROKER_MESSAGE" desc="Message for the page action when Pepper broker access was blocked">
-        An unsandboxed plugin was prevented from running on this page.
-      </message>
-      <message name="IDS_ALLOWED_PPAPI_BROKER_MESSAGE" desc="Message for the page action when Pepper broker access was allowed">
-        An unsandboxed plugin was allowed to run on this page.
-      </message>
-      <message name="IDS_BLOCKED_PPAPI_BROKER_UNBLOCK" desc="Radio button to unblock the Pepper broker">
-        Always allow unsandboxed plugins on <ph name="HOST">$1<ex>example.com</ex></ph>
-      </message>
-      <message name="IDS_BLOCKED_PPAPI_BROKER_NO_ACTION" desc="Radio button to keep blocking the Pepper broker">
-        Continue blocking unsandboxed plugins
-      </message>
-      <message name="IDS_ALLOWED_PPAPI_BROKER_NO_ACTION" desc="Radio button to keep allowing the Pepper broker">
-        Continue allowing unsandboxed plugins
-      </message>
-      <message name="IDS_ALLOWED_PPAPI_BROKER_BLOCK" desc="Radio button to block the Pepper broker">
-        Always block unsandboxed plugins on <ph name="HOST">$1<ex>example.com</ex></ph>
-      </message>
 
       <!-- Blocked Displaying/Running Insecure Content bubble -->
       <message name="IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT_TITLE" desc="Title of the bubble shown when a message has asked Chrome to display mixed content.">
@@ -5200,7 +5195,7 @@ the Bookmarks menu.">
         </message>
       </if>
 
-      <if expr="is_win or (is_linux and not is_chromeos)">
+      <if expr="is_win or (is_linux and not chromeos)">
         <!-- Confirm to quit panel -->
         <message name="IDS_CONFIRM_TO_QUIT_DESCRIPTION" desc="Instructions for how the user should confirm quitting.">
           Hold |<ph name="ACCELERATOR1">$1<ex>Ctrl</ex></ph>|+|<ph name="ACCELERATOR2">$2<ex>Shift</ex></ph>|+|<ph name="ACCELERATOR3">$3<ex>Q</ex></ph>| to exit