| Index: chrome/browser/browser_process_impl.cc
|
| diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
|
| index 00f01b8eb6c2ce439d73258cf374b57f35c5a881..970d490a945d2efe1950dbdbb8bca699167b66fe 100644
|
| --- a/chrome/browser/browser_process_impl.cc
|
| +++ b/chrome/browser/browser_process_impl.cc
|
| @@ -27,6 +27,7 @@
|
| #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"
|
| @@ -740,9 +741,6 @@ prerender::PrerenderTracker* BrowserProcessImpl::prerender_tracker() {
|
| }
|
|
|
| ComponentUpdateService* BrowserProcessImpl::component_updater() {
|
| -#if defined(OS_CHROMEOS)
|
| - return NULL;
|
| -#else
|
| if (!component_updater_.get()) {
|
| ComponentUpdateService::Configurator* configurator =
|
| MakeChromeComponentUpdaterConfigurator(
|
| @@ -753,13 +751,13 @@ ComponentUpdateService* BrowserProcessImpl::component_updater() {
|
| 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.
|
| return NULL;
|
| #else
|
| if (!crl_set_fetcher_.get())
|
| @@ -768,6 +766,13 @@ CRLSetFetcher* BrowserProcessImpl::crl_set_fetcher() {
|
| #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()));
|
|
|