Profile shouldn't own Session/TabRestore services.

chrome/browser/sessions/tab_restore_service_browsertest.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/sessions/session_types.h"
 #include "chrome/browser/sessions/session_service.h"
+#include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/test/render_view_test.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 
@@ skipping 58 matching lines @@
     // Must set service to null first so that it is destroyed before the new
     // one is created.
     service_.reset();
     service_.reset(new TabRestoreService(profile(), time_factory_));
     service_->LoadTabsFromLastSession();
   }
 
   // Adds a window with one tab and url to the profile's session service.
   // If |pinned| is true, the tab is marked as pinned in the session service.
   void AddWindowWithOneTabToSessionService(bool pinned) {
-    SessionService* session_service = profile()->GetSessionService();
+    SessionService* session_service =
+        SessionServiceFactory::GetForProfile(profile());
     SessionID tab_id;
     SessionID window_id;
     session_service->SetWindowType(window_id, Browser::TYPE_NORMAL);
     session_service->SetTabWindow(window_id, tab_id);
     session_service->SetTabIndexInWindow(window_id, tab_id, 0);
     session_service->SetSelectedTabInWindow(window_id, 0);
     if (pinned)
       session_service->SetPinnedState(window_id, tab_id, true);
     NavigationEntry entry;
     entry.set_url(url1_);
     session_service->UpdateTabNavigation(window_id, tab_id, 0, entry);
   }
 
   // Creates a SessionService and assigns it to the Profile. The SessionService
   // is configured with a single window with a single tab pointing at url1_ by
   // way of AddWindowWithOneTabToSessionService. If |pinned| is true, the
   // tab is marked as pinned in the session service.
   void CreateSessionServiceWithOneWindow(bool pinned) {
     // The profile takes ownership of this.
     SessionService* session_service = new SessionService(profile());
-    profile()->set_session_service(session_service);
+    SessionServiceFactory::SetForTestProfile(profile(), session_service);
 
     AddWindowWithOneTabToSessionService(pinned);
 
     // Set this, otherwise previous session won't be loaded.
     profile()->set_last_session_exited_cleanly(false);
   }
 
   GURL url1_;
   GURL url2_;
   GURL url3_;
@@ skipping 163 matching lines @@
   service_->LoadTabsFromLastSession();
 
   // There should only be one entry.
   ASSERT_EQ(1U, service_->entries().size());
 }
 
 // Makes sure we load the previous session as necessary.
 TEST_F(TabRestoreServiceTest, LoadPreviousSession) {
   CreateSessionServiceWithOneWindow(false);
 
-  profile()->GetSessionService()->MoveCurrentSessionToLastSession();
+  SessionServiceFactory::GetForProfile(profile())->
+      MoveCurrentSessionToLastSession();
 
   service_->LoadTabsFromLastSession();
 
   // Make sure we get back one entry with one tab whose url is url1.
   ASSERT_EQ(1U, service_->entries().size());
   TabRestoreService::Entry* entry2 = service_->entries().front();
   ASSERT_EQ(TabRestoreService::WINDOW, entry2->type);
   TabRestoreService::Window* window =
       static_cast<TabRestoreService::Window*>(entry2);
   ASSERT_EQ(1U, window->tabs.size());
   EXPECT_EQ(0, window->timestamp.ToInternalValue());
   EXPECT_EQ(0, window->selected_tab_index);
   ASSERT_EQ(1U, window->tabs[0].navigations.size());
   EXPECT_EQ(0, window->tabs[0].current_navigation_index);
   EXPECT_EQ(0, window->tabs[0].timestamp.ToInternalValue());
   EXPECT_TRUE(url1_ == window->tabs[0].navigations[0].virtual_url());
 }
 
 // Makes sure we don't attempt to load previous sessions after a restore.
 TEST_F(TabRestoreServiceTest, DontLoadAfterRestore) {
   CreateSessionServiceWithOneWindow(false);
 
-  profile()->GetSessionService()->MoveCurrentSessionToLastSession();
+  SessionServiceFactory::GetForProfile(profile())->
+      MoveCurrentSessionToLastSession();
 
   profile()->set_restored_last_session(true);
 
   service_->LoadTabsFromLastSession();
 
   // Because we restored a session TabRestoreService shouldn't load the tabs.
   ASSERT_EQ(0U, service_->entries().size());
 }
 
 // Makes sure we don't attempt to load previous sessions after a clean exit.
 TEST_F(TabRestoreServiceTest, DontLoadAfterCleanExit) {
   CreateSessionServiceWithOneWindow(false);
 
-  profile()->GetSessionService()->MoveCurrentSessionToLastSession();
+  SessionServiceFactory::GetForProfile(profile())->
+      MoveCurrentSessionToLastSession();
 
   profile()->set_last_session_exited_cleanly(true);
 
   service_->LoadTabsFromLastSession();
 
   ASSERT_EQ(0U, service_->entries().size());
 }
 
 TEST_F(TabRestoreServiceTest, LoadPreviousSessionAndTabs) {
   CreateSessionServiceWithOneWindow(false);
 
-  profile()->GetSessionService()->MoveCurrentSessionToLastSession();
+  SessionServiceFactory::GetForProfile(profile())->
+      MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
   service_->CreateHistoricalTab(&controller(), -1);
 
   RecreateService();
 
   // We should get back two entries, one from the previous session and one from
   // the tab restore service. The previous session entry should be first.
   ASSERT_EQ(2U, service_->entries().size());
@@ skipping 21 matching lines @@
             tab->timestamp.ToInternalValue());
   EXPECT_TRUE(url1_ == tab->navigations[0].virtual_url());
   EXPECT_TRUE(url2_ == tab->navigations[1].virtual_url());
   EXPECT_TRUE(url3_ == tab->navigations[2].virtual_url());
 }
 
 // Make sure pinned state is correctly loaded from session service.
 TEST_F(TabRestoreServiceTest, LoadPreviousSessionAndTabsPinned) {
   CreateSessionServiceWithOneWindow(true);
 
-  profile()->GetSessionService()->MoveCurrentSessionToLastSession();
+  SessionServiceFactory::GetForProfile(profile())->
+      MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
   service_->CreateHistoricalTab(&controller(), -1);
 
   RecreateService();
 
   // We should get back two entries, one from the previous session and one from
   // the tab restore service. The previous session entry should be first.
   ASSERT_EQ(2U, service_->entries().size());
@@ skipping 22 matching lines @@
 }
 
 // Creates TabRestoreService::kMaxEntries + 1 windows in the session service
 // and makes sure we only get back TabRestoreService::kMaxEntries on restore.
 TEST_F(TabRestoreServiceTest, ManyWindowsInSessionService) {
   CreateSessionServiceWithOneWindow(false);
 
   for (size_t i = 0; i < TabRestoreService::kMaxEntries; ++i)
     AddWindowWithOneTabToSessionService(false);
 
-  profile()->GetSessionService()->MoveCurrentSessionToLastSession();
+  SessionServiceFactory::GetForProfile(profile())->
+      MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
   service_->CreateHistoricalTab(&controller(), -1);
 
   RecreateService();
 
   // We should get back kMaxEntries entries. We added more, but
   // TabRestoreService only allows up to kMaxEntries.
   ASSERT_EQ(TabRestoreService::kMaxEntries, service_->entries().size());
@@ skipping 39 matching lines @@
   ASSERT_EQ(1U, service_->entries().size());
 
   // And verify the entry.
   TabRestoreService::Entry* restored_entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, restored_entry->type);
   TabRestoreService::Tab* restored_tab =
       static_cast<TabRestoreService::Tab*>(restored_entry);
   EXPECT_EQ(tab_timestamp.ToInternalValue(),
             restored_tab->timestamp.ToInternalValue());
 }