Profile shouldn't own Session/TabRestore services.

chrome/browser/ui/browser_init.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/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 22 matching lines @@
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/print_dialog_cloud.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_service.h"
+#include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
 #include "chrome/browser/tabs/pinned_tab_codec.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 794 matching lines @@
   // If we're starting up in "background mode" (no open browser window) then
   // don't open any browser windows.
   if (process_startup && command_line_.HasSwitch(switches::kNoStartupWindow))
     return;
 
   if (process_startup && ProcessStartupURLs(urls_to_open)) {
     // ProcessStartupURLs processed the urls, nothing else to do.
     return;
   }
 
-  if (!process_startup &&
-      (profile_->GetSessionService() &&
-       profile_->GetSessionService()->RestoreIfNecessary(urls_to_open))) {
-    // We're already running and session restore wanted to run. This can happen
-    // at various points, such as if there is only an app window running and the
-    // user double clicked the chrome icon. Return so we don't open the urls.
-    return;
+  if (!process_startup) {
+    SessionService* service = SessionServiceFactory::GetForProfile(profile_);
+    if (service && service->RestoreIfNecessary(urls_to_open)) {
+      // We're already running and session restore wanted to run. This can
+      // happen at various points, such as if there is only an app window
+      // running and the user double clicked the chrome icon. Return so we don't
+      // open the urls.
+      return;
+    }
   }
 
   // Session restore didn't occur, open the urls.
 
   Browser* browser = NULL;
   std::vector<GURL> adjust_urls = urls_to_open;
   if (adjust_urls.empty())
     AddStartupURLs(&adjust_urls);
   else if (!command_line_.HasSwitch(switches::kOpenInNewWindow))
     browser = BrowserList::GetLastActiveWithProfile(profile_);
@@ skipping 514 matching lines @@
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }