Profile shouldn't own Session/TabRestore services.

chrome/test/testing_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/test/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 17 matching lines @@
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/sessions/session_service.h"
+#include "chrome/browser/sessions/session_service_factory.h"
+#include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/ntp_resource_cache.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/test_url_request_context_getter.h"
 #include "chrome/test/testing_pref_service.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/browser_thread.h"
@@ skipping 131 matching lines @@
     }
   }
 
   // Install profile keyed service factory hooks for dummy/test services
   BackgroundContentsServiceFactory::GetInstance()->ForceAssociationBetween(
       this, NULL);
   DesktopNotificationServiceFactory::GetInstance()->set_test_factory(
       &CreateTestDesktopNotificationService);
   DesktopNotificationServiceFactory::GetInstance()->ForceAssociationBetween(
       this, NULL);
+  SessionServiceFactory::GetInstance()->ForceAssociationBetween(this, NULL);
+  TabRestoreServiceFactory::GetInstance()->ForceAssociationBetween(this, NULL);
 }
 
 TestingProfile::~TestingProfile() {
   NotificationService::current()->Notify(
       NotificationType::PROFILE_DESTROYED,
       Source<Profile>(static_cast<Profile*>(this)),
       NotificationService::NoDetails());
 
   profile_dependency_manager_->DestroyProfileServices(this);
 
@@ skipping 438 matching lines @@
     geolocation_permission_context_ =
         new GeolocationPermissionContext(this);
   }
   return geolocation_permission_context_.get();
 }
 
 HostZoomMap* TestingProfile::GetHostZoomMap() {
   return NULL;
 }
 
-SessionService* TestingProfile::GetSessionService() {
-  return session_service_.get();
-}
-
-bool TestingProfile::HasSessionService() const {
-  return (session_service_.get() != NULL);
-}
-
 bool TestingProfile::HasProfileSyncService() const {
   return (profile_sync_service_.get() != NULL);
 }
 
 std::wstring TestingProfile::GetName() {
   return std::wstring();
 }
 
 std::wstring TestingProfile::GetID() {
   return id_;
@@ skipping 12 matching lines @@
 }
 
 bool TestingProfile::IsSameProfile(Profile *p) {
   return this == p;
 }
 
 base::Time TestingProfile::GetStartTime() const {
   return start_time_;
 }
 
-TabRestoreService* TestingProfile::GetTabRestoreService() {
-  return NULL;
-}
-
 ProtocolHandlerRegistry* TestingProfile::GetProtocolHandlerRegistry() {
   return protocol_handler_registry_.get();
 }
 
 SpellCheckHost* TestingProfile::GetSpellCheckHost() {
   return NULL;
 }
 
-void TestingProfile::set_session_service(SessionService* session_service) {
-  session_service_.reset(session_service);
-}
-
 WebKitContext* TestingProfile::GetWebKitContext() {
   if (webkit_context_ == NULL) {
     webkit_context_ = new WebKitContext(
           IsOffTheRecord(), GetPath(),
           GetExtensionSpecialStoragePolicy(),
           false);
   }
   return webkit_context_;
 }
 
@@ skipping 104 matching lines @@
 }
 
 DerivedTestingProfile::DerivedTestingProfile(Profile* profile)
     : original_profile_(profile) {}
 
 DerivedTestingProfile::~DerivedTestingProfile() {}
 
 ProfileId DerivedTestingProfile::GetRuntimeId() {
   return original_profile_->GetRuntimeId();
 }