Profile shouldn't own Session/TabRestore services.

chrome/browser/sessions/session_restore.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_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_service.h"
+#include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 384 matching lines @@
       : profile_(profile),
         browser_(browser),
         synchronous_(synchronous),
         clobber_existing_window_(clobber_existing_window),
         always_create_tabbed_browser_(always_create_tabbed_browser),
         urls_to_open_(urls_to_open),
         restore_started_(base::TimeTicks::Now()) {
   }
 
   Browser* Restore() {
-    SessionService* session_service = profile_->GetSessionService();
+    SessionService* session_service =
+        SessionServiceFactory::GetForProfile(profile_);
     DCHECK(session_service);
     SessionService::SessionCallback* callback =
         NewCallback(this, &SessionRestoreImpl::OnGotSession);
     session_service->GetLastSession(&request_consumer_, callback);
 
     if (synchronous_) {
       bool old_state = MessageLoop::current()->NestableTasksAllowed();
       MessageLoop::current()->SetNestableTasksAllowed(true);
       MessageLoop::current()->Run();
       MessageLoop::current()->SetNestableTasksAllowed(old_state);
@@ skipping 284 matching lines @@
       params.disposition = i == 0 ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
       params.tabstrip_index = index;
       params.tabstrip_add_types = add_types;
       browser::Navigate(&params);
     }
   }
 
   // Invokes TabRestored on the SessionService for all tabs in browser after
   // initial_count.
   void NotifySessionServiceOfRestoredTabs(Browser* browser, int initial_count) {
-    SessionService* session_service = profile_->GetSessionService();
+    SessionService* session_service =
+        SessionServiceFactory::GetForProfile(profile_);
     for (int i = initial_count; i < browser->tab_count(); ++i)
       session_service->TabRestored(&browser->GetTabContentsAt(i)->controller(),
                                    browser->tabstrip_model()->IsTabPinned(i));
   }
 
   // The profile to create the sessions for.
   Profile* profile_;
 
   // The first browser to restore to, may be null.
   Browser* browser_;
@@ skipping 41 matching lines @@
                         bool always_create_tabbed_browser,
                         const std::vector<GURL>& urls_to_open) {
 #if defined(OS_CHROMEOS)
   chromeos::BootTimesLoader::Get()->AddLoginTimeMarker(
       "SessionRestoreStarted", false);
 #endif
   DCHECK(profile);
   // Always restore from the original profile (incognito profiles have no
   // session service).
   profile = profile->GetOriginalProfile();
-  if (!profile->GetSessionService()) {
+  if (!SessionServiceFactory::GetForProfile(profile)) {
     NOTREACHED();
     return NULL;
   }
   restoring = true;
   profile->set_restored_last_session(true);
   // SessionRestoreImpl takes care of deleting itself when done.
   SessionRestoreImpl* restorer =
       new SessionRestoreImpl(profile, browser, synchronous,
                              clobber_existing_window,
                              always_create_tabbed_browser, urls_to_open);
@@ skipping 36 matching lines @@
 Browser* SessionRestore::RestoreSessionSynchronously(
     Profile* profile,
     const std::vector<GURL>& urls_to_open) {
   return Restore(profile, NULL, true, false, true, urls_to_open);
 }
 
 // static
 bool SessionRestore::IsRestoring() {
   return restoring;
 }