Turn on component updater on chromeos, only for the pnacl component.

chrome/browser/browser_process_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_process_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/alias.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/component_updater/component_updater_configurator.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
+#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/devtools/remote_debugging_server.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/download/download_status_updater.h"
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #include "chrome/browser/extensions/extension_renderer_state.h"
 #include "chrome/browser/first_run/upgrade_util.h"
 #include "chrome/browser/gpu/gl_string_manager.h"
 #include "chrome/browser/gpu/gpu_mode_manager.h"
 #include "chrome/browser/icon_manager.h"
@@ skipping 693 matching lines @@
 }
 
 prerender::PrerenderTracker* BrowserProcessImpl::prerender_tracker() {
   if (!prerender_tracker_.get())
     prerender_tracker_.reset(new prerender::PrerenderTracker);
 
   return prerender_tracker_.get();
 }
 
 ComponentUpdateService* BrowserProcessImpl::component_updater() {
-#if defined(OS_CHROMEOS)
-  return NULL;
-#else
   if (!component_updater_.get()) {
     ComponentUpdateService::Configurator* configurator =
         MakeChromeComponentUpdaterConfigurator(
             CommandLine::ForCurrentProcess(),
             io_thread()->system_url_request_context_getter());
     // Creating the component updater does not do anything, components
     // need to be registered and Start() needs to be called.
     component_updater_.reset(ComponentUpdateServiceFactory(configurator));
   }
   return component_updater_.get();
-#endif
 }
 
 CRLSetFetcher* BrowserProcessImpl::crl_set_fetcher() {
 #if defined(OS_CHROMEOS)
-  // There's no component updater on ChromeOS so there can't be a CRLSetFetcher
-  // either.
+  // There is component updater on ChromeOS, but it is only used when data
+  // is not shared between users.  Currently not making a CRLSetFetcher
+  // component for ChromeOS.

[cpu_(ooo_6.6-7.5), 2013/03/29 22:24:39]

do we need this ifdef block? given that we aleady ifdef the registration of the
crl component?

[jvoung (off chromium), 2013/03/29 22:54:52]

Yeah, seems like we don't need to ifdef this anymore.  The constructor doesn't
do anything.

[jvoung (off chromium), 2013/03/29 23:22:40]

Done -- also removed the null checks that I added since it can't be null
anymore.

   return NULL;
 #else
   if (!crl_set_fetcher_.get())
     crl_set_fetcher_ = new CRLSetFetcher();
   return crl_set_fetcher_.get();
 #endif
 }
 
+PnaclComponentInstaller* BrowserProcessImpl::pnacl_component_installer() {
+  if (!pnacl_component_installer_.get())
+    pnacl_component_installer_.reset(new PnaclComponentInstaller());
+  return pnacl_component_installer_.get();
+}
+
 void BrowserProcessImpl::ResourceDispatcherHostCreated() {
   resource_dispatcher_host_delegate_.reset(
       new ChromeResourceDispatcherHostDelegate(prerender_tracker()));
   ResourceDispatcherHost::Get()->SetDelegate(
       resource_dispatcher_host_delegate_.get());
 
   pref_change_registrar_.Add(
       prefs::kAllowCrossOriginAuthPrompt,
       base::Bind(&BrowserProcessImpl::ApplyAllowCrossOriginAuthPromptPolicy,
                  base::Unretained(this)));
@@ skipping 267 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)