Make PNaCl component downloadable for chromeos-chrome built for Linux

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index b509e20670fb4fb623f76565cb0a90dbb08056be..d20f5307391c83f78a4aaa8246cdee27e2b76812 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -144,6 +144,7 @@
 #endif
 
 #if defined(OS_CHROMEOS)
+#include "base/sys_info.h"

[jvoung (off chromium), 2014/10/17 16:55:47]

I think sys_info is already included above, so this may not be needed.

[Dmitry Polukhin, 2014/10/20 07:14:23]

Good catch, thank you!

 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/settings/cros_settings_names.h"
@@ -402,9 +403,13 @@ void RegisterComponentsForUpdate() {
   RegisterPepperFlashComponent(cus);
   RegisterSwiftShaderComponent(cus);
   RegisterWidevineCdmComponent(cus);
-#if !defined(DISABLE_NACL)
-  g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus);
 #endif
+
+#if !defined(DISABLE_NACL) && !defined(OS_ANDROID)
+#if defined(OS_CHROMEOS)
+  if (!base::SysInfo::IsRunningOnChromeOS())

[jvoung (off chromium), 2014/10/17 16:55:47]

Maybe leave a comment that on ChromeOS it's part of the rootfs, but not for
Chrome4ChromeOS on Linux?

... tradeoff between comments going stale and figuring out why it is these
conditions. Up to you or Lei.

[Lei Zhang, 2014/10/17 21:59:55]

A comment would be good. Otherwise it's not obvious at all why we need this.

[Dmitry Polukhin, 2014/10/20 07:14:22]

Done.

+#endif
+    g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus);
 #endif
 
   if (translate::CldDataSource::ShouldRegisterForComponentUpdates()) {