Profile shouldn't own Session/TabRestore services.

content/browser/tab_contents/navigation_controller_unittest.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 "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/session_service.h"
+#include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_service_test_helper.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/test_notification_tracker.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 30 matching lines @@
     // lifetime is managed by profile_manager_.
     STLDeleteElements(&windows_);
   }
 
   // testing::Test overrides.
   virtual void SetUp() {
     NavigationControllerTest::SetUp();
 
     // Force the session service to be created.
     SessionService* service = new SessionService(profile());
-    profile()->set_session_service(service);
+    SessionServiceFactory::SetForTestProfile(profile(), service);
     service->SetWindowType(window_id, Browser::TYPE_NORMAL);
     service->SetWindowBounds(window_id, gfx::Rect(0, 1, 2, 3), false);
     service->SetTabIndexInWindow(window_id,
                                  controller().session_id(), 0);
     controller().SetWindowID(window_id);
 
     session_helper_.set_service(service);
   }
 
   virtual void TearDown() {
     // Release profile's reference to the session service. Otherwise the file
     // will still be open and we won't be able to delete the directory below.
     session_helper_.ReleaseService(); // profile owns this
-    profile()->set_session_service(NULL);
+    SessionServiceFactory::SetForTestProfile(profile(), NULL);
 
     // Make sure we wait for history to shut down before continuing. The task
     // we add will cause our message loop to quit once it is destroyed.
     HistoryService* history =
         profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
     if (history) {
       history->SetOnBackendDestroyTask(new MessageLoop::QuitTask);
       MessageLoop::current()->Run();
     }
 
     // Do normal cleanup before deleting the profile directory below.
     NavigationControllerTest::TearDown();
 
     ASSERT_TRUE(file_util::Delete(test_dir_, true));
     ASSERT_FALSE(file_util::PathExists(test_dir_));
   }
 
   // Deletes the current profile manager and creates a new one. Indirectly this
   // shuts down the history database and reopens it.
   void ReopenDatabase() {
     session_helper_.set_service(NULL);
-    profile()->set_session_service(NULL);
+    SessionServiceFactory::SetForTestProfile(profile(), NULL);
 
     SessionService* service = new SessionService(profile());
-    profile()->set_session_service(service);
+    SessionServiceFactory::SetForTestProfile(profile(), service);
     session_helper_.set_service(service);
   }
 
   void GetLastSession() {
-    profile()->GetSessionService()->TabClosed(controller().window_id(),
-                                              controller().session_id(),
-                                              false);
+    SessionServiceFactory::GetForProfile(profile())->TabClosed(
+        controller().window_id(), controller().session_id(), false);
 
     ReopenDatabase();
     Time close_time;
 
     session_helper_.ReadWindows(&windows_);
   }
 
   CancelableRequestConsumer consumer;
 
   // URLs for testing.
@@ skipping 2114 matching lines @@
   TabNavigation nav(0, url0, GURL(), string16(),
                     webkit_glue::CreateHistoryStateForURL(url0),
                     PageTransition::LINK);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[0]);
   nav.set_url(url2);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[1]);
 }
 */