Revert 192415 "Turn on component updater on chromeos, only for t..."

This seemed to break Chromium OS (x86) ASAN:

http://build.chromium.org/p/chromium.memory/builders/Chromium%20OS%20%28x86%29%20ASAN/builds/3552

==26271== ERROR: AddressSanitizer: SEGV on unknown address 0x00000000 (pc 0x66dd8299 sp 0x7f8d7040 bp 0x7f8d7588 T0)
AddressSanitizer can not provide additional info.
    #0 0x66dd8298 in (anonymous namespace)::FinishPnaclUpdateRegistration(ComponentUpdateService*, Version const&, PnaclComponentInstaller*) chrome/browser/component_updater/pnacl/pnacl_component_installer.cc:0
    #1 0x66dd9a5b in base::internal::Invoker<3, base::internal::BindState<base::internal::RunnableAdapter<void (*)(ComponentUpdateService*, Version const&, PnaclComponentInstaller*)>, void ()(ComponentUpdateService*, Version const&, PnaclComponentInstaller*), void ()(ComponentUpdateService*, Version, PnaclComponentInstaller*)>, void ()(ComponentUpdateService*, Version const&, PnaclComponentInstaller*)>::Run(base::internal::BindStateBase*) ???:0
    #2 0x673626c4 in base::MessageLoop::RunTask(base::PendingTask const&) ???:0
    #3 0x67362ec1 in base::MessageLoop::DeferOrRunPendingTask(base::PendingTask const&) ???:0
    #4 0x67363df6 in base::MessageLoop::DoWork() ???:0



> Turn on component updater on chromeos, only for the pnacl component.
> 
> Make the pnacl component place files in a profile-specific directory
> for chromeos.  We don't want to share data between users on
> chromeos because of questions about integrity of these files.
> This adds a notification watcher and will re-register pnacl with
> a different version whenever the user logs into
> a different account.
> 
> Files are installed to a stateful partition, which should
> be okay.  The stateful partition is mounted no-exec, but
> the pnacl files are not typical executables.
> 
> This is a temporary solution to help with testing out PNaCl on chromeos.
> We will need to find a different solution later that does
> not involve multiple copies, one for each user.
> 
> BUG=221381
> TEST= manual with:
> 
> 1) export GYP_DEFINES="chromeos=1"
> 2) build
> 3) out/Release/chrome --enable-pnacl --enable-nacl --user-data-dir=/tmp/temp_profile_chromeos
> 4) wait 20 seconds and see /tmp/temp_profile_chromeos/test-user/pnacl/0.0.0.5 show up
> 
> Review URL: https://codereview.chromium.org/13071002

TBR=jvoung@google.com
Review URL: https://codereview.chromium.org/13510006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192435 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 6 deletions

diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 93d1901..0d2199f 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -132,7 +132,6 @@ class BrowserProcessImpl : public BrowserProcess,
   virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE;
   virtual ComponentUpdateService* component_updater() OVERRIDE;
   virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
-  virtual PnaclComponentInstaller* pnacl_component_installer() OVERRIDE;
   virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
   virtual chrome::MediaFileSystemRegistry*
       media_file_system_registry() OVERRIDE;
@@ -287,13 +286,11 @@ class BrowserProcessImpl : public BrowserProcess,
 
 #if defined(OS_CHROMEOS)
   scoped_ptr<chromeos::OomPriorityManager> oom_priority_manager_;
-#endif
-  // component updater is normally not used under ChromeOS due
-  // to concerns over integrity of data shared between profiles,
-  // but some users of component updater only install per-user.
+#else
   scoped_ptr<ComponentUpdateService> component_updater_;
+
   scoped_refptr<CRLSetFetcher> crl_set_fetcher_;
-  scoped_ptr<PnaclComponentInstaller> pnacl_component_installer_;
+#endif
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   scoped_refptr<PluginsResourceService> plugins_resource_service_;