Fix disable_nacl=0 build for Android

Fix disable_nacl=0 build for Android

Allow android build to include native client.  This CL removes the check
(on android only) that native client applications need to come from the chrome
web store.  It also fixes some inclusions of files that assert the extension
system is built in.

BUG=https://code.google.com/p/nativeclient/issues/detail?id=3032

Committed: https://crrev.com/453ce5ad6fbae5613d09422a735f2345be2f6cf6
Cr-Commit-Position: refs/heads/master@{#300523}

[sehr, 2014-10-20 22:35:04]

sehr@chromium.org changed reviewers:
+ dyen@chromium.org

[sehr, 2014-10-20 22:35:19]

PTAL.

[David Yen, 2014-10-20 22:40:55]

On 2014/10/20 22:35:19, sehr (please use this account) wrote:
> PTAL.

LGTM with green trybots and extended #ifdef EXTENSION macro to include all the
extension files.

[sehr, 2014-10-20 22:50:48]

sehr@chromium.org changed reviewers:
+ jamescook@chromium.org

[sehr, 2014-10-20 22:55:24]

sehr@chromium.org changed reviewers:
+ jhawkins@chromium.org

[sehr, 2014-10-20 22:55:24]

I'm trying to get a prototype build of a native client enabled Android working
again.  James Cook, your change of 8/16 seems to have introduced a dependency on
the extensions system that we had worked around before, which I have attempted
to remove and would appreciate a review for.  Jhawkins, I would appreciate a
review for the chrome bits from you.

Thanks in advance.

[James Hawkins, 2014-10-20 23:08:56]

LGTM though I'm sad this requires littering with #ifdefs.

[James Cook, 2014-10-20 23:24:28]

LGTM

It looks like in https://codereview.chromium.org/437503004 I moved some general
chrome constants into a component that was only compiled in for with-nacl
builds, so I added the ifdefs to
chrome/renderer/chrome_content_renderer_client.cc.  It's not clear to me that
that file would have ever compiled with-nacl-without-extensions.  But it looks
fine to me in this CL.

Thanks for fixing it!

[sehr, 2014-10-20 23:28:17]

The CQ bit was checked by sehr@chromium.org

[sehr, 2014-10-20 23:29:43]

On 2014/10/20 23:24:28, James Cook wrote:
> LGTM
> 
> It looks like in https://codereview.chromium.org/437503004 I moved some
general
> chrome constants into a component that was only compiled in for with-nacl
> builds, so I added the ifdefs to
> chrome/renderer/chrome_content_renderer_client.cc.  It's not clear to me that
> that file would have ever compiled with-nacl-without-extensions.  But it looks
> fine to me in this CL.
> 
> Thanks for fixing it!

Sorry I implied more certainty in blaming your CL than I have.  I don't know how
it worked before.
Thanks for the reviews!

[commit-bot: I haz the power, 2014-10-20 23:30:15]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/671573002/20001

[commit-bot: I haz the power, 2014-10-21 01:08:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-21 01:08:48]

Try jobs failed on following builders:
  win_chromium_rel_swarming on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[sehr, 2014-10-21 17:10:56]

The CQ bit was checked by sehr@chromium.org

[commit-bot: I haz the power, 2014-10-21 17:13:01]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/671573002/20001

[commit-bot: I haz the power, 2014-10-21 18:05:10]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2014-10-21 18:05:51]

Patchset 2 (id:??) landed as
https://crrev.com/453ce5ad6fbae5613d09422a735f2345be2f6cf6
Cr-Commit-Position: refs/heads/master@{#300523}