Added extension macro checks for android plugin files.

Added extension macro checks for android plugin files.

Some extension files are compiled on android when enable_plugins is set
to 1. These files need to have the parts that references extension
files compiled out of the code.

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

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

[David Yen, 2014-08-19 20:36:59]

Adding Justin to this CL.

I had to disable some code when plugin is enabled but not extensions, this is a
tricky case on android.

[teravest, 2014-08-19 20:41:24]

lgtm

Looks reasonable.

[David Yen, 2014-08-19 20:41:58]

The CQ bit was checked by dyen@chromium.org

[commit-bot: I haz the power, 2014-08-19 20:42:38]

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

[David Yen, 2014-08-19 20:45:56]

The CQ bit was unchecked by dyen@chromium.org

[David Yen, 2014-08-19 20:48:42]

Adding Mark.

Mark, do my changes look reasonable for the cases where extensions are disabled
for android?

[David Yen, 2014-08-19 20:53:45]

On 2014/08/19 20:48:42, David Yen wrote:
> Adding Mark.
> 
> Mark, do my changes look reasonable for the cases where extensions are
disabled
> for android?

Forgot to mention: Mark, I am looking for a review of
"nacl_browser_delegate_impl.cc".

[Mark Seaborn, 2014-08-19 23:41:31]

I'm not familiar with ENABLE_PLUGINS and ENABLE_EXTENSIONS.  Are both usually
true for desktop Chrome and false for Android?  Does one imply the other?  I'm
not a terribly good reviewer for this change. :-(

https://codereview.chromium.org/468913006/diff/1/chrome/browser/nacl_host/nac...
File chrome/browser/nacl_host/nacl_browser_delegate_impl.cc (right):

https://codereview.chromium.org/468913006/diff/1/chrome/browser/nacl_host/nac...
chrome/browser/nacl_host/nacl_browser_delegate_impl.cc:234: return NULL;
It doesn't look like all the call sites handle GetExtensionInfoMap() returning
NULL (e.g. above).  Should this be a CHECK(false), or should the whole function
be in the #if?

[David Yen, 2014-08-21 17:31:49]

Yes, traditionally plugins and extensions are both enabled on desktop and are
disabled on android. We are currently trying to enable plugins on android in
order to support NaCl.

My main question is if there would be any unintended side effects
MapUrlToLocalFilePath() returned false? I am assuming returning false for
IsNonSfiModeAllowed() is fine.

https://codereview.chromium.org/468913006/diff/1/chrome/browser/nacl_host/nac...
File chrome/browser/nacl_host/nacl_browser_delegate_impl.cc (right):

https://codereview.chromium.org/468913006/diff/1/chrome/browser/nacl_host/nac...
chrome/browser/nacl_host/nacl_browser_delegate_impl.cc:234: return NULL;
On 2014/08/19 23:41:30, Mark Seaborn wrote:
> It doesn't look like all the call sites handle GetExtensionInfoMap() returning
> NULL (e.g. above).  Should this be a CHECK(false), or should the whole
function
> be in the #if?

This function is private so I believe you are right, the correct thing to do
would be to #ifdef out the entire function.

[Mark Seaborn, 2014-08-21 17:37:16]

LGTM

[David Yen, 2014-08-21 17:44:57]

The CQ bit was checked by dyen@chromium.org

[commit-bot: I haz the power, 2014-08-21 17:46:00]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dyen@chromium.org/468913006/20001

[commit-bot: I haz the power, 2014-08-21 21:56:28]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  linux_chromium_chromeos_rel_swarming on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[commit-bot: I haz the power, 2014-08-21 22:55:56]

Committed patchset #2 (20001) as 291219