Resurrect ExtensionProcessManager. Move the code for starting extension

instances from ExtensionsService to the manager.

Unlike ExtensionsService, EPM is not shared between an incognito Profile and
its parent.
Review URL: http://codereview.chromium.org/109044

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

1 files changed, 17 insertions, 1 deletions

diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 2a95f9e..86f32b6 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
+#include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/history/history.h"
@@ -87,6 +88,9 @@ class OffTheRecordProfileImpl : public Profile,
         start_time_(Time::Now()) {
     request_context_ = ChromeURLRequestContext::CreateOffTheRecord(this);
     request_context_->AddRef();
+
+    extension_process_manager_.reset(new ExtensionProcessManager(this));
+
     // Register for browser close notifications so we can detect when the last
     // off-the-record window is closed, in which case we can clean our states
     // (cookies, downloads...).
@@ -145,6 +149,10 @@ class OffTheRecordProfileImpl : public Profile,
     return profile_->GetUserScriptMaster();
   }
 
+  virtual ExtensionProcessManager* GetExtensionProcessManager() {
+    return extension_process_manager_.get();
+  }
+
   virtual SSLHostState* GetSSLHostState() {
     if (!ssl_host_state_.get())
       ssl_host_state_.reset(new SSLHostState());
@@ -338,6 +346,9 @@ class OffTheRecordProfileImpl : public Profile,
   // the user visited while OTR.
   scoped_ptr<SSLHostState> ssl_host_state_;
 
+  // Extensions run in a different context in incognito mode.
+  scoped_ptr<ExtensionProcessManager> extension_process_manager_;
+
   // Time we were started.
   Time start_time_;
 
@@ -346,7 +357,6 @@ class OffTheRecordProfileImpl : public Profile,
 
 ProfileImpl::ProfileImpl(const FilePath& path)
     : path_(path),
-      off_the_record_(false),
       request_context_(NULL),
       media_request_context_(NULL),
       history_service_created_(false),
@@ -361,6 +371,8 @@ ProfileImpl::ProfileImpl(const FilePath& path)
       TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this,
       &ProfileImpl::EnsureSessionServiceCreated);
 
+  extension_process_manager_.reset(new ExtensionProcessManager(this));
+
   PrefService* prefs = GetPrefs();
   prefs->AddPrefObserver(prefs::kSpellCheckDictionary, this);
   prefs->AddPrefObserver(prefs::kEnableSpellCheck, this);
@@ -563,6 +575,10 @@ UserScriptMaster* ProfileImpl::GetUserScriptMaster() {
   return user_script_master_.get();
 }
 
+ExtensionProcessManager* ProfileImpl::GetExtensionProcessManager() {
+  return extension_process_manager_.get();
+}
+
 SSLHostState* ProfileImpl::GetSSLHostState() {
   if (!ssl_host_state_.get())
     ssl_host_state_.reset(new SSLHostState());