Remove Profile and HostDesktopType dependencies from core TabRestore code

chrome/browser/sessions/persistent_tab_restore_service.cc

 // Copyright 2012 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/persistent_tab_restore_service.h"
 
 #include <cstring>  // memcpy
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 908 matching lines @@
           return;
         }
       }
     }
   }
 }
 
 // PersistentTabRestoreService -------------------------------------------------
 
 PersistentTabRestoreService::PersistentTabRestoreService(
-    Profile* profile,
     scoped_ptr<sessions::TabRestoreServiceClient> client,
     TimeFactory* time_factory)
     : client_(client.Pass()),
       delegate_(new Delegate(client_.get())),
-      helper_(this, delegate_.get(), profile, client_.get(), time_factory) {
+      helper_(this, delegate_.get(), client_.get(), time_factory) {
   delegate_->set_tab_restore_service_helper(&helper_);
 }
 
 PersistentTabRestoreService::~PersistentTabRestoreService() {}
 
 void PersistentTabRestoreService::AddObserver(
     TabRestoreServiceObserver* observer) {
   helper_.AddObserver(observer);
 }
 
@@ skipping 22 matching lines @@
   helper_.ClearEntries();
 }
 
 const TabRestoreService::Entries& PersistentTabRestoreService::entries() const {
   return helper_.entries();
 }
 
 std::vector<content::WebContents*>
 PersistentTabRestoreService::RestoreMostRecentEntry(
     TabRestoreServiceDelegate* delegate,
-    chrome::HostDesktopType host_desktop_type) {
+    int host_desktop_type) {
   return helper_.RestoreMostRecentEntry(delegate, host_desktop_type);
 }
 
 TabRestoreService::Tab* PersistentTabRestoreService::RemoveTabEntryById(
     SessionID::id_type id) {
   return helper_.RemoveTabEntryById(id);
 }
 
 std::vector<content::WebContents*>
-    PersistentTabRestoreService::RestoreEntryById(
-      TabRestoreServiceDelegate* delegate,
-      SessionID::id_type id,
-      chrome::HostDesktopType host_desktop_type,
-      WindowOpenDisposition disposition) {
+PersistentTabRestoreService::RestoreEntryById(
+    TabRestoreServiceDelegate* delegate,
+    SessionID::id_type id,
+    int host_desktop_type,
+    WindowOpenDisposition disposition) {
   return helper_.RestoreEntryById(delegate, id, host_desktop_type, disposition);
 }
 
 bool PersistentTabRestoreService::IsLoaded() const {
   return delegate_->IsLoaded();
 }
 
 void PersistentTabRestoreService::DeleteLastSession() {
   return delegate_->DeleteLastSession();
 }
 
 void PersistentTabRestoreService::Shutdown() {
   return delegate_->Shutdown();
 }
 
 void PersistentTabRestoreService::LoadTabsFromLastSession() {
   delegate_->LoadTabsFromLastSession();
 }
 
 TabRestoreService::Entries* PersistentTabRestoreService::mutable_entries() {
   return &helper_.entries_;
 }
 
 void PersistentTabRestoreService::PruneEntries() {
   helper_.PruneEntries();
 }