Profile shouldn't own Session/TabRestore services.

chrome/browser/ui/gtk/global_history_menu.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/gtk/global_history_menu.h"
 
 #include <gtk/gtk.h>
 
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sessions/tab_restore_service.h"
+#include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
 #include "chrome/browser/ui/gtk/global_menu_bar.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 81 matching lines @@
                                        menu_item_history_map_.end());
   menu_item_history_map_.clear();
 }
 
 void GlobalHistoryMenu::Init(GtkWidget* history_menu) {
   history_menu_ = history_menu;
 
   default_favicon_ = GtkThemeService::GetDefaultFavicon(true);
 
   if (profile_) {
-    tab_restore_service_ = profile_->GetTabRestoreService();
+    tab_restore_service_ = TabRestoreServiceFactory::GetForProfile(profile_);
     if (tab_restore_service_) {
       tab_restore_service_->LoadTabsFromLastSession();
       tab_restore_service_->AddObserver(this);
 
       // If LoadTabsFromLastSession doesn't load tabs, it won't call
       // TabRestoreServiceChanged(). This ensures that all new windows after
       // the first one will have their menus populated correctly.
       TabRestoreServiceChanged(tab_restore_service_);
     }
 
@@ skipping 317 matching lines @@
   tab_restore_service_ = NULL;
 }
 
 void GlobalHistoryMenu::OnRecentlyClosedItemActivated(GtkWidget* sender) {
   WindowOpenDisposition disposition =
       gtk_util::DispositionForCurrentButtonPressEvent();
   HistoryItem* item = HistoryItemForMenuItem(sender);
 
   // If this item can be restored using TabRestoreService, do so. Otherwise,
   // just load the URL.
-  TabRestoreService* service = browser_->profile()->GetTabRestoreService();
+  TabRestoreService* service =
+      TabRestoreServiceFactory::GetForProfile(browser_->profile());
   if (item->session_id && service) {
     service->RestoreEntryById(browser_->tab_restore_service_delegate(),
                               item->session_id, false);
   } else {
     DCHECK(item->url.is_valid());
     browser_->OpenURL(item->url, GURL(), disposition,
                       PageTransition::AUTO_BOOKMARK);
   }
 }