Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

chrome/browser/tabs/tab_strip_model.cc

Index: chrome/browser/tabs/tab_strip_model.cc
===================================================================
--- chrome/browser/tabs/tab_strip_model.cc	(revision 115900)
+++ chrome/browser/tabs/tab_strip_model.cc	(working copy)
@@ -34,6 +34,7 @@
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_delegate.h"
 
+using content::NavigationEntry;
 using content::UserMetricsAction;
 using content::WebContents;
 
@@ -216,14 +217,13 @@
                           NULL /* base_tab_contents */,
                           NULL /* session_storage_namespace */));
   TabContentsWrapper* old_contents = GetContentsAt(index);
-  content::NavigationEntry* old_nav_entry =
+  NavigationEntry* old_nav_entry =
       old_contents->tab_contents()->GetController().GetActiveEntry();
   if (old_nav_entry) {
     // Set the new tab contents to reload this URL when clicked.
     // This also allows the tab to keep drawing the favicon and page title.
-    content::NavigationEntry* new_nav_entry =
-        content::NavigationEntry::Create(*old_nav_entry);
-    std::vector<content::NavigationEntry*> entries;
+    NavigationEntry* new_nav_entry = NavigationEntry::Create(*old_nav_entry);
+    std::vector<NavigationEntry*> entries;
     entries.push_back(new_nav_entry);
     null_contents->tab_contents()->GetController().Restore(0, false, &entries);
   }