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

chrome/browser/sessions/session_types.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/sessions/session_types.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "content/browser/tab_contents/navigation_controller.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 
 using content::NavigationEntry;
 
 // TabNavigation --------------------------------------------------------------
 
 TabNavigation::TabNavigation()
     : transition_(content::PAGE_TRANSITION_TYPED),
       type_mask_(0),
       index_(-1) {
@@ skipping 34 matching lines @@
   state_ = tab.state_;
   transition_ = tab.transition_;
   type_mask_ = tab.type_mask_;
   index_ = tab.index_;
   return *this;
 }
 
 // static
 NavigationEntry* TabNavigation::ToNavigationEntry(
     int page_id, Profile *profile) const {
-  NavigationEntry* entry = NavigationController::CreateNavigationEntry(
+  NavigationEntry* entry = content::NavigationController::CreateNavigationEntry(
       virtual_url_,
       referrer_,
       // Use a transition type of reload so that we don't incorrectly
       // increase the typed count.
       content::PAGE_TRANSITION_RELOAD,
       false,
       // The extra headers are not sync'ed across sessions.
       std::string(),
       profile);
 
@@ skipping 42 matching lines @@
 SessionWindow::SessionWindow()
     : selected_tab_index(-1),
       type(Browser::TYPE_TABBED),
       is_constrained(true),
       show_state(ui::SHOW_STATE_DEFAULT) {
 }
 
 SessionWindow::~SessionWindow() {
   STLDeleteElements(&tabs);
 }