Fix iOS device builds broken by commit d645540

Fix iOS device builds broken by r232181

r232181 changed build/common.gypi to set ARCHS=i386 explicitly for
target_arch==ia32. However, we don't want to set ARCHS=i386 for iOS device
builds (because iOS devices are a different architecture entirely). This CL
arranges to leaved ARCHS untouched for iOS builds, so that Xcode will use its
defaults; this was the behavior before r232181.

The non-intuitive aspect is that target_arch==ia32 for OS=="ios", because
host_arch is set to 'ia32' at line 88 of build/common.gypi for 'OS=="win" or
OS=="mac" or OS=="ios"' and target_arch is set from host_arch at line 117.

With build/common.gypi fixed, we also need to fix
discardable_memory_provider_unittest.cc for iOS device builds, now that it is
being compiled with the correct architecture.

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

[Mark Mentovai, 2013-11-04 20:28:42]

https://codereview.chromium.org/58373003/diff/1/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/58373003/diff/1/build/common.gypi#newcode4662
build/common.gypi:4662: ['target_arch=="x64"', {
How about instead, move this whole block from 4662 through 4674 into the “else”
clause for OS=="ios", which you can introduce on line 4661? Then it’s
self-documenting and I don’t think the comment is even necessary.

[kiyun, 2013-11-04 20:48:50]

https://codereview.chromium.org/58373003/diff/1/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/58373003/diff/1/build/common.gypi#newcode4662
build/common.gypi:4662: ['target_arch=="x64"', {
On 2013/11/04 20:28:42, Mark Mentovai wrote:
> How about instead, move this whole block from 4662 through 4674 into the
“else”
> clause for OS=="ios", which you can introduce on line 4661? Then it’s
> self-documenting and I don’t think the comment is even necessary.

Done.

[Mark Mentovai, 2013-11-04 20:52:33]

LGTM!

https://codereview.chromium.org/58373003/diff/70001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/58373003/diff/70001/build/common.gypi#newcode...
build/common.gypi:4667: }, {
Say
  }, {  # OS!="ios"
on this line, as is often done for “else” clauses.

[kiyun, 2013-11-04 21:02:18]

Also, s/commit d645540/r232181/ in CL description.

https://codereview.chromium.org/58373003/diff/70001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/58373003/diff/70001/build/common.gypi#newcode...
build/common.gypi:4667: }, {
On 2013/11/04 20:52:33, Mark Mentovai wrote:
> Say
>   }, {  # OS!="ios"
> on this line, as is often done for “else” clauses.

Done.

[commit-bot: I haz the power, 2013-11-04 21:37:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kiyun@chromium.org/58373003/140001

[commit-bot: I haz the power, 2013-11-05 02:35:46]

Retried try job too often on linux_aura for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...

[commit-bot: I haz the power, 2013-11-05 03:29:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kiyun@chromium.org/58373003/140001

[commit-bot: I haz the power, 2013-11-05 05:12:29]

Step "update" is always a major failure.
Look at the try server FAQ for more details.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-05 12:30:54]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kiyun@chromium.org/58373003/470001

[Mark Mentovai, 2013-11-05 13:48:43]

https://codereview.chromium.org/58373003/diff/470001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/58373003/diff/470001/build/common.gypi#newcod...
build/common.gypi:4672: ],
Check the indentation. There’s one space to many on this line. The ] should line
up under the ' that begins the ARCHS line.

https://codereview.chromium.org/58373003/diff/470001/build/common.gypi#newcod...
build/common.gypi:4677: ],
This one too.

[kiyun, 2013-11-05 13:56:24]

https://codereview.chromium.org/58373003/diff/470001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/58373003/diff/470001/build/common.gypi#newcod...
build/common.gypi:4672: ],
On 2013/11/05 13:48:44, Mark Mentovai wrote:
> Check the indentation. There’s one space to many on this line. The ] should
line
> up under the ' that begins the ARCHS line.

Done.

https://codereview.chromium.org/58373003/diff/470001/build/common.gypi#newcod...
build/common.gypi:4677: ],
On 2013/11/05 13:48:44, Mark Mentovai wrote:
> This one too.

Done.

[commit-bot: I haz the power, 2013-11-05 13:58:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kiyun@chromium.org/58373003/710001

[commit-bot: I haz the power, 2013-11-05 15:47:07]

Retried try job too often on win_rel for step(s) chrome_frame_net_tests,
chrome_frame_tests, chrome_frame_unittests, nacl_integration,
sync_integration_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-05 16:16:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kiyun@chromium.org/58373003/710001

[commit-bot: I haz the power, 2013-11-05 19:11:51]

Change committed as 233050