Revert of Drop NaCl dependencies on platforms where disable_nacl=1.

Revert of Drop NaCl dependencies on platforms where disable_nacl=1. (https://codereview.chromium.org/321423002/)

Reason for revert:
This seems to cause build failure on disable_nacl=1 build.
There are still some dependency to nacl_switches and nacl_module_handler like:
src/chrome/browser/ui/startup/bad_flags_prompt.cc:46
src/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc:376
src/chrome/browser/extensions/plugin_manager.cc:71

Original issue's description:
> Drop NaCl dependencies on platforms where disable_nacl=1.
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=283505

TBR=palmer@chromium.org, thestig@chromium.org, bradnelson@chromium.org
NOTRY=true

[tzik, 2014-07-17 05:01:31]

Created Revert of Drop NaCl dependencies on platforms where disable_nacl=1.

[tzik, 2014-07-17 05:01:56]

The CQ bit was unchecked by tzik@chromium.org

[Lei Zhang, 2014-07-17 05:04:41]

Did I break a bot somewhere?

[tzik, 2014-07-17 05:11:13]

On 2014/07/17 05:04:41, Lei Zhang wrote:
> Did I break a bot somewhere?

No, it just break my local build with disable_nacl=1.

[tzik, 2014-07-17 05:16:28]

On 2014/07/17 05:11:13, tzik wrote:
> On 2014/07/17 05:04:41, Lei Zhang wrote:
> > Did I break a bot somewhere?
> 
> No, it just break my local build with disable_nacl=1.

Should we stop reverting and fix it now?

[tzik, 2014-07-17 05:27:50]

On 2014/07/17 05:16:28, tzik wrote:
> On 2014/07/17 05:11:13, tzik wrote:
> > On 2014/07/17 05:04:41, Lei Zhang wrote:
> > > Did I break a bot somewhere?
> > 
> > No, it just break my local build with disable_nacl=1.
> 
> Should we stop reverting and fix it now?

If so, https://codereview.chromium.org/398273002/ should work.

[Lei Zhang, 2014-07-17 05:29:37]

On 2014/07/17 05:16:28, tzik wrote:
> On 2014/07/17 05:11:13, tzik wrote:
> > On 2014/07/17 05:04:41, Lei Zhang wrote:
> > > Did I break a bot somewhere?
> > 
> > No, it just break my local build with disable_nacl=1.
> 
> Should we stop reverting and fix it now?

Oh, you are doing a desktop build with disable_nacl turned on. Can we try to fix
it?

The code in pnacl_component_installer.cc is being removed:
https://codereview.chromium.org/398213002/
bad_flags_prompt.cc just needs a #ifdef.
plugin_manager.cc might need a bit more work.

[tzik, 2014-07-17 05:47:03]

On 2014/07/17 05:29:37, Lei Zhang wrote:
> On 2014/07/17 05:16:28, tzik wrote:
> > On 2014/07/17 05:11:13, tzik wrote:
> > > On 2014/07/17 05:04:41, Lei Zhang wrote:
> > > > Did I break a bot somewhere?
> > > 
> > > No, it just break my local build with disable_nacl=1.
> > 
> > Should we stop reverting and fix it now?
> 
> Oh, you are doing a desktop build with disable_nacl turned on. Can we try to
fix
> it?
Yes, it's just for faster build. OK, so let's just fix without revert.

> 
> The code in pnacl_component_installer.cc is being removed:
> https://codereview.chromium.org/398213002/
> bad_flags_prompt.cc just needs a #ifdef.
> plugin_manager.cc might need a bit more work.