Profile shouldn't own background page stuff.

chrome/browser/profiles/profile.cc

 // Copyright (c) 2011 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/profiles/profile.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
-#include "chrome/browser/background_contents_service.h"
+#include "chrome/browser/background_contents_service_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/off_the_record_profile_io_data.h"
@@ skipping 131 matching lines @@
  public:
   explicit OffTheRecordProfileImpl(Profile* real_profile)
       : profile_(real_profile),
         prefs_(real_profile->GetOffTheRecordPrefs()),
         ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
         start_time_(Time::Now()) {
     extension_process_manager_.reset(ExtensionProcessManager::Create(this));
 
     BrowserList::AddObserver(this);
 
-    background_contents_service_.reset(
-        new BackgroundContentsService(this, CommandLine::ForCurrentProcess()));
+    BackgroundContentsServiceFactory::GetForProfile(this);
 
     DCHECK(real_profile->GetPrefs()->GetBoolean(prefs::kIncognitoEnabled));
 
     // TODO(oshima): Remove the need to eagerly initialize the request context
     // getter. chromeos::OnlineAttempt is illegally trying to access this
     // Profile member from a thread other than the UI thread, so we need to
     // prevent a race.
 #if defined(OS_CHROMEOS)
     GetRequestContext();
 #endif  // defined(OS_CHROMEOS)
@@ skipping 79 matching lines @@
   virtual VisitedLinkMaster* GetVisitedLinkMaster() {
     // We don't provide access to the VisitedLinkMaster when we're OffTheRecord
     // because we don't want to leak the sites that the user has visited before.
     return NULL;
   }
 
   virtual ExtensionService* GetExtensionService() {
     return GetOriginalProfile()->GetExtensionService();
   }
 
-  virtual BackgroundContentsService* GetBackgroundContentsService() const {
-    return background_contents_service_.get();
-  }
-
   virtual StatusTray* GetStatusTray() {
     return GetOriginalProfile()->GetStatusTray();
   }
 
   virtual UserScriptMaster* GetUserScriptMaster() {
     return GetOriginalProfile()->GetUserScriptMaster();
   }
 
   virtual ExtensionDevToolsManager* GetExtensionDevToolsManager() {
     // TODO(mpcomplete): figure out whether we should return the original
@@ skipping 435 matching lines @@
   Time start_time_;
 
   scoped_refptr<ChromeAppCacheService> appcache_service_;
 
   // The main database tracker for this profile.
   // Should be used only on the file thread.
   scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
 
   FilePath last_selected_directory_;
 
-  // Tracks all BackgroundContents running under this profile.
-  scoped_ptr<BackgroundContentsService> background_contents_service_;
-
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
 
   // The file_system context for this profile.
   scoped_refptr<fileapi::FileSystemContext> file_system_context_;
 
   scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
 
   scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;
 
   // Used read-only.
@@ skipping 26 matching lines @@
 };
 #endif
 
 Profile* Profile::CreateOffTheRecordProfile() {
 #if defined(OS_CHROMEOS)
   if (Profile::IsGuestSession())
     return new GuestSessionProfile(this);
 #endif
   return new OffTheRecordProfileImpl(this);
 }