Profile shouldn't own Session/TabRestore services.

chrome/browser/jumplist_win.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/jumplist_win.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
+#include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 549 matching lines @@
 
 bool JumpList::AddObserver(Profile* profile) {
   // To update JumpList when a tab is added or removed, we add this object to
   // the observer list of the TabRestoreService class.
   // When we add this object to the observer list, we save the pointer to this
   // TabRestoreService object. This pointer is used when we remove this object
   // from the observer list.
   if (base::win::GetVersion() < base::win::VERSION_WIN7 || !profile)
     return false;
 
-  TabRestoreService* tab_restore_service = profile->GetTabRestoreService();
+  TabRestoreService* tab_restore_service =
+      TabRestoreServiceFactory::GetForProfile(profile);
   if (!tab_restore_service)
     return false;
 
   app_id_ = ShellIntegration::GetChromiumAppId(profile->GetPath());
   icon_dir_ = profile->GetPath().Append(chrome::kJumpListIconDirname);
   profile_ = profile;
   tab_restore_service->AddObserver(this);
   return true;
 }
 
 void JumpList::RemoveObserver() {
-  if (profile_ && profile_->GetTabRestoreService())
-    profile_->GetTabRestoreService()->RemoveObserver(this);
+  if (profile_) {
+    TabRestoreService* tab_restore_service =
+        TabRestoreServiceFactory::GetForProfile(profile_);
+    if (tab_restore_service)
+      tab_restore_service->RemoveObserver(this);
+  }
   profile_ = NULL;
 }
 
 void JumpList::TabRestoreServiceChanged(TabRestoreService* service) {
   // Added or removed a tab.
   // Exit if we are updating the application JumpList.
   if (!icon_urls_.empty())
     return;
 
   // Send a query to HistoryService and retrieve the "Most Visited" pages.
@@ skipping 103 matching lines @@
   // * arguments
   //   The last URL of the tab object.
   // * title
   //   The title of the last URL.
   // * icon
   //   An empty string. This value is to be updated in OnFaviconDataAvailable().
   // This code is copied from
   // RecentlyClosedTabsHandler::TabRestoreServiceChanged() to emulate it.
   const int kRecentlyClosedCount = 4;
   recently_closed_pages_.clear();
-  TabRestoreService* tab_restore_service = profile_->GetTabRestoreService();
+  TabRestoreService* tab_restore_service =
+      TabRestoreServiceFactory::GetForProfile(profile_);
   const TabRestoreService::Entries& entries = tab_restore_service->entries();
   for (TabRestoreService::Entries::const_iterator it = entries.begin();
        it != entries.end(); ++it) {
     const TabRestoreService::Entry* entry = *it;
     if (entry->type == TabRestoreService::TAB) {
       AddTab(static_cast<const TabRestoreService::Tab*>(entry),
              &recently_closed_pages_, kRecentlyClosedCount);
     } else if (entry->type == TabRestoreService::WINDOW) {
       AddWindow(static_cast<const TabRestoreService::Window*>(entry),
                 &recently_closed_pages_, kRecentlyClosedCount);
@@ skipping 25 matching lines @@
   // the file thread.
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       new JumpListUpdateTask(app_id_.c_str(), icon_dir_, most_visited_pages_,
                              recently_closed_pages_));
 
   // Delete all items in these lists since we don't need these lists any longer.
   most_visited_pages_.clear();
   recently_closed_pages_.clear();
 }