Switch to using '-t ios' for grit

Switch to using '-t ios' for grit

grit now supports passing '-t ios', which sets is_ios, and doesn't set
is_macosx (matching the semantics of gyp). All instances of
pp_ifdef('ios') change to is_ios, matching the syntax used by other
platforms.

Because this flips the setting of is_macosx for iOS, most places where
code looked at is_macosx also now look for is_ios. This CL errs on the
side of being behavior-preserving, adding is_ios checks in some places
where they probably aren't needed, to avoid accidental regressions.
In places where it's very obvious it's not needed, it hasn't been
added.

Also adds a missing is_ios to history.html, resolving drift from
not-yet-upstreamed changes.

BUG=227781
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=218386

[stuartmorgan, 2013-08-07 16:50:37]

rohitrao: for review
darin: for OWNERS (since the UI OWNERS are out, it looks like)

[stuartmorgan, 2013-08-07 16:51:32]

I should note that of course the is_ios stuff in chrome/ will eventually all be
removed as layered component work progresses, but for now it's needed.

[rohitrao (ping after 24h), 2013-08-07 17:07:21]

lgtm

[stuartmorgan, 2013-08-13 18:45:41]

darin: ping for OWNERS

[darin (slow to review), 2013-08-13 18:49:18]

rubber stamp LGTM

[commit-bot: I haz the power, 2013-08-19 22:12:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/stuartmorgan@chromium.org/22600003/1

[commit-bot: I haz the power, 2013-08-19 22:12:37]

Failed to apply patch for chrome/app/generated_resources.grd:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/app/generated_resources.grd
  Hunk #2 succeeded at 2309 (offset -1064 lines).
  Hunk #3 succeeded at 2352 (offset -1064 lines).
  Hunk #4 succeeded at 2362 (offset -1064 lines).
  Hunk #5 succeeded at 6994 (offset -1021 lines).
  Hunk #6 succeeded at 7146 (offset -1021 lines).
  Hunk #7 succeeded at 8391 (offset -1043 lines).
  Hunk #8 succeeded at 8534 (offset -1043 lines).
  Hunk #9 succeeded at 8555 (offset -1043 lines).
  Hunk #10 succeeded at 8644 (offset -1043 lines).
  Hunk #11 succeeded at 8652 (offset -1043 lines).
  Hunk #12 succeeded at 8663 (offset -1043 lines).
  Hunk #13 succeeded at 8671 (offset -1043 lines).
  Hunk #14 succeeded at 8920 (offset -1043 lines).
  Hunk #15 succeeded at 9023 (offset -1043 lines).
  Hunk #16 succeeded at 10108 (offset -1032 lines).
  Hunk #17 succeeded at 10123 (offset -1032 lines).
  Hunk #18 succeeded at 10322 (offset -1032 lines).
  Hunk #19 succeeded at 10330 (offset -1032 lines).
  Hunk #20 succeeded at 10338 (offset -1032 lines).
  Hunk #21 succeeded at 13249 (offset -1024 lines).
  Hunk #22 succeeded at 13514 (offset -1024 lines).
  Hunk #23 succeeded at 13808 (offset -1003 lines).
  Hunk #24 FAILED at 15288.
  Hunk #25 succeeded at 14729 (offset -990 lines).
  Hunk #26 succeeded at 14739 (offset -990 lines).
  1 out of 26 hunks FAILED -- saving rejects to file
chrome/app/generated_resources.grd.rej

Patch:       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
2f8e883116d91af0595414ccb0242cb73cf2ce93..75ed361a14e0b928baafce075b7bbe66353dd49f
100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -84,11 +84,11 @@ are declared in build/common.gypi.
          be 'nb'. -->
     <output filename="generated_resources_nb.pak" type="data_package" lang="no"
/>
     <output filename="generated_resources_pl.pak" type="data_package" lang="pl"
/>
-    <if expr="pp_ifdef('ios')">
+    <if expr="is_ios">
       <!-- iOS uses pt for pt-BR -->
       <output filename="generated_resources_pt.pak" type="data_package"
lang="pt-BR" />
     </if>
-    <if expr="not pp_ifdef('ios')">
+    <if expr="not is_ios">
       <output filename="generated_resources_pt-BR.pak" type="data_package"
lang="pt-BR" />
     </if>
     <output filename="generated_resources_pt-PT.pak" type="data_package"
lang="pt-PT" />
@@ -3373,12 +3373,12 @@ Psst! Incognito mode <ph
name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
       <message name="IDS_CERT_ERROR_EXTRA_INFO_TITLE" desc="The title for the
extra information section displayed when a page contains a certificate error">
         Help me understand
       </message>
-      <if expr="is_android or pp_ifdef('ios')">
+      <if expr="is_android or is_ios">
         <message name="IDS_CERT_ERROR_EXTRA_INFO_1" desc="Mobile: 1st paragraph
of extra information for any certificate error">
           When you connect to a secure website, the server hosting that site
presents your browser with something called a "certificate" to verify its
identity. This certificate contains identity information, such as the address of
the website, which is verified by a third party that your device trusts. By
checking that the address in the certificate matches the address of the website,
it is possible to verify that you are securely communicating with the website
you intended, and not a third party (such as an attacker on your network).
         </message>
       </if>
-      <if expr="not is_android and not pp_ifdef('ios')">
+      <if expr="not is_android and not is_ios">
         <message name="IDS_CERT_ERROR_EXTRA_INFO_1" desc="1st paragraph of
extra information for any certificate error">
           When you connect to a secure website, the server hosting that site
presents your browser with something called a "certificate" to verify its
identity. This certificate contains identity information, such as the address of
the website, which is verified by a third party that your computer trusts. By
checking that the address in the certificate matches the address of the website,
it is possible to verify that you are securely communicating with the website
you intended, and not a third party (such as an attacker on your network).
         </message>
@@ -3416,7 +3416,7 @@ Psst! Incognito mode <ph
name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
       <message name="IDS_CERT_ERROR_AUTHORITY_INVALID_TITLE" desc="Title for an
X509 certificate with an invalid authority">
         The site's security certificate is not trusted!
       </message>
-      <if expr="is_android or pp_ifdef('ios')">
+      <if expr="is_android or is_ios">
         <message name="IDS_CERT_ERROR_AUTHORITY_INVALID_EXTRA_INFO_2"
desc="Mobile: 2nd paragraph of extra information for a X509 certificate with an
invalid authority">
           In this case, the certificate has not been verified by a third party
that your device trusts. Anyone can create a certificate claiming to be whatever
website they choose, which is why it must be verified by a trusted third party.
Without that verification, the identity information in the certificate is
meaningless. It is therefore not possible to verify that you are communicating
with <ph name="DOMAIN">&lt;strong&gt;$1<ex>paypal.com</ex>&lt;/strong&gt;</ph>
instead of an attacker who generated his own certificate claiming to be <ph
name="DOMAIN2">&lt;strong&gt;$2<ex>paypal.com</ex>&lt;/strong&gt;</ph>. You
should not proceed past this point.
         </message>
@@ -3426,7 +3426,7 @@ Psst! Incognito mode <ph
name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
           If, however, you work in an organization that generates its own
certificates, and you are trying to connect to an internal website of that
organization using such a certificate, you may be able to solve this problem
securely. You can import your organization's root certificate as a "root
certificate", and then certificates issued or verified by your organization will
be trusted and you will not see this error next time you try to connect to an
internal website. Contact your organization's help staff for assistance in
adding a new root certificate to your device.
         </message>
       </if>
-      <if expr="not is_android and not pp_ifdef('ios')">
+      <if expr="not is_android and not is_ios">
         <message name="IDS_CERT_ERROR_AUTHORITY_INVALID_EXTRA_INFO_2" desc="2nd
paragraph of extra information for a X509 certificate with an invalid
authority">
           In this case, the certificate has not been verified by a third party
that your computer trusts. Anyone can create a certificate claiming to be
whatever website they choose, which is why it must be verified by a trusted
third party. Without that verification, the identity information in the
certificate is meaningless. It is therefore not possible to verify that you are
communicating with <ph
name="DOMAIN">&lt;strong&gt;$1<ex>paypal.com</ex>&lt;/strong&gt;</ph> instead of
an attacker who generated his own certificate claiming to be <ph
name="DOMAIN2">&lt;strong&gt;$2<ex>paypal.com</ex>&lt;/strong&gt;</ph>. You
should not proceed past this point.
         </message>
@@ -8015,7 +8015,7 @@ Keep your key file in a safe place. You will need it to
create new versions of y
       <message name="IDS_OMNIBOX_KEYWORD_TEXT" desc="Text shown in the search
button at the front of the omnibox when the user has selected a keyword">
         Search <ph name="SITE_NAME">$1<ex>google.com</ex></ph>:
       </message>
-      <if expr="pp_ifdef('ios')">
+      <if expr="is_ios">
         <message name="IDS_OMNIBOX_EMPTY_HINT" desc="The text displayed in the
omnibox when it is empty.">
           Search or type URL
         </message>
@@ -8167,7 +8167,7 @@ Keep your key file in a safe place. You will need it to
create new versions of y
       <message name="IDS_ACCNAME_WEB_CONTENTS" desc="The accessible name for
the web contents.">
         Web Contents
       </message>
-      <if expr="pp_ifdef('ios')">
+      <if expr="is_ios">
         <message name="IDS_ACCNAME_CLEAR_TEXT" desc="The accessibility label
for the clear text button in the location bar [Length: unlimited].">
           Clear Text
         </message>
@@ -9434,14 +9434,14 @@ The following plug-in is unresponsive: <ph
name="PLUGIN_NAME">$1
       <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_HEADER" desc="When
a webpage fails to load, in some cases we suggest checking the proxy server
configuration, or disabling the proxy server.  This is a header above some
details.">
         If you use a proxy server...
       </message>
-      <if expr="is_android or pp_ifdef('ios')">
+      <if expr="is_android or is_ios">
         <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_BODY" desc="When
a webpage fails to load, in some cases we suggest checking the proxy server
configuration, or disabling the proxy server.  These are instructions below a
header.">
           Check your proxy settings or contact your network administrator to
           make sure the proxy server is working.
           <ph name="PLATFORM_TEXT">$1<ex>Goto the wrench menu and choose Fix
It.</ex></ph>
         </message>
       </if>
-      <if expr="not is_android and not pp_ifdef('ios')">
+      <if expr="not is_android and not is_ios">
         <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_BODY" desc="When
a webpage fails to load, in some cases we suggest checking the proxy server
configuration, or disabling the proxy server.  These are instructions below a
header.">
           Check your proxy settings or contact your network administrator to
           make sure the proxy server is working. If you don't believe you
should
@@ -9577,7 +9577,7 @@ The following plug-in is unresponsiv…
(message too large)

[commit-bot: I haz the power, 2013-08-19 22:26:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/stuartmorgan@chromium.org/22600003/9001

[commit-bot: I haz the power, 2013-08-20 01:01:17]

Change committed as 218386