Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

chrome/browser/ui/browser_tab_restore_service_delegate.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_tab_restore_service_delegate.h"
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "content/browser/tab_contents/navigation_controller.h"
+#include "content/public/browser/navigation_controller.h"
 
 using content::WebContents;
 
 void BrowserTabRestoreServiceDelegate::ShowBrowserWindow() {
   browser_->window()->Show();
 }
 
 const SessionID& BrowserTabRestoreServiceDelegate::GetSessionID() const {
   return browser_->session_id();
 }
@@ skipping 54 matching lines @@
 TabRestoreServiceDelegate* TabRestoreServiceDelegate::Create(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   if (browser)
     return browser->tab_restore_service_delegate();
   else
     return NULL;
 }
 
 // static
 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateForController(
-    const NavigationController* controller,
+    const content::NavigationController* controller,
     int* index) {
   Browser* browser = Browser::GetBrowserForController(controller, index);
   if (browser)
     return browser->tab_restore_service_delegate();
   else
     return NULL;
 }
 
 // static
 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateWithID(
     SessionID::id_type desired_id) {
   Browser* browser = BrowserList::FindBrowserWithID(desired_id);
   if (browser)
     return browser->tab_restore_service_delegate();
   else
     return NULL;
 }