Remove Profile and HostDesktopType dependencies from core TabRestore code

chrome/browser/ui/browser_tabrestore_browsertest.cc

 // Copyright 2014 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/chrome_notification_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
-#include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 
 typedef InProcessBrowserTest BrowserTabRestoreTest;
 
@@ skipping 95 matching lines @@
   CloseBrowser(browser());
   EXPECT_EQ(1u, active_browser_list->size());
 
   // Check the browser has a delegated restore service.
   Browser* browser = active_browser_list->get(0);
   TabRestoreService* service =
       TabRestoreServiceFactory::GetForProfile(browser->profile());
   bool has_tab_restore_service = !!service;
   ASSERT_TRUE(has_tab_restore_service);
   TabRestoreServiceDelegate* delegate =
-      TabRestoreServiceDelegate::FindDelegateForWebContents(
+      BrowserTabRestoreServiceDelegate::FindDelegateForWebContents(
           browser->tab_strip_model()->GetActiveWebContents());
   bool has_tab_restore_delegate = !!delegate;
   ASSERT_TRUE(has_tab_restore_delegate);
 
   // Restore tabs using that delegated restore service.
   content::DOMMessageQueue queue;
   service->RestoreMostRecentEntry(
       delegate, browser->host_desktop_type());
   AwaitTabsReady(&queue, 2);
 
   // There should be 3 restored tabs in the new browser.
   EXPECT_EQ(2u, active_browser_list->size());
   browser = active_browser_list->get(1);
   EXPECT_EQ(3, browser->tab_strip_model()->count());
 
   // The middle tab only should have visible disposition.
   CheckVisbility(browser->tab_strip_model(), 1);
 }