Most references to GetActiveEntry removed from chrome/browser/ui.

chrome/browser/ui/browser_commands.cc

Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index e774fa9ec57c98818772c8b6b34072151c7bd326..9a9af87b2fbcda0c8bcb44bebf2d81c7967b2190 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -254,11 +254,10 @@ int GetContentRestrictions(const Browser* browser) {
     CoreTabHelper* core_tab_helper =
         CoreTabHelper::FromWebContents(current_tab);
     content_restrictions = core_tab_helper->content_restrictions();
-    NavigationEntry* active_entry =
-        current_tab->GetController().GetActiveEntry();
+    NavigationEntry* entry =
+        current_tab->GetController().GetLastCommittedEntry();
     // See comment in UpdateCommandsForTabState about why we call url().
-    if (!content::IsSavableURL(
-            active_entry ? active_entry->GetURL() : GURL()) ||
+    if (!content::IsSavableURL(entry ? entry->GetURL() : GURL()) ||
         current_tab->ShowingInterstitialPage())
       content_restrictions |= CONTENT_RESTRICTION_SAVE;
     if (current_tab->ShowingInterstitialPage())
@@ -980,7 +979,7 @@ void ToggleSpeechInput(Browser* browser) {
 bool CanRequestTabletSite(WebContents* current_tab) {
   if (!current_tab)
     return false;
-  return current_tab->GetController().GetActiveEntry() != NULL;
+  return current_tab->GetController().GetLastCommittedEntry() != NULL;

[jww, 2013/11/15 23:10:50]

@sky: I know you gave the LGTM already, but can you just double check this as
well since you reviewed https://chromiumcodereview.appspot.com/10827146? creis
asked:

"If the user looking at page A and has started a navigation to a slow page B
that hasn't committed yet, should the RequestTabletSite feature affect page A
(last committed) or page B (visible URL / pending entry)?"

Thanks!

 }
 
 bool IsRequestingTabletSite(Browser* browser) {
@@ -988,7 +987,7 @@ bool IsRequestingTabletSite(Browser* browser) {
   if (!current_tab)
     return false;
   content::NavigationEntry* entry =
-      current_tab->GetController().GetActiveEntry();
+      current_tab->GetController().GetLastCommittedEntry();
   if (!entry)
     return false;
   return entry->GetIsOverridingUserAgent();
@@ -999,7 +998,7 @@ void ToggleRequestTabletSite(Browser* browser) {
   if (!current_tab)
     return;
   NavigationController& controller = current_tab->GetController();
-  NavigationEntry* entry = controller.GetActiveEntry();
+  NavigationEntry* entry = controller.GetLastCommittedEntry();
   if (!entry)
     return;
   if (entry->GetIsOverridingUserAgent()) {
@@ -1054,25 +1053,25 @@ void ViewSource(Browser* browser,
   content::RecordAction(UserMetricsAction("ViewSource"));
   DCHECK(contents);
 
-  // Note that Clone does not copy the pending or transient entries, so the
-  // active entry in view_source_contents will be the last committed entry.
+  // Note that Clone does not copy the pending or transient entries, so we can
+  // take the last committed entry in view_source_contents.
   WebContents* view_source_contents = contents->Clone();
   DCHECK(view_source_contents->GetController().CanPruneAllButLastCommitted());
   view_source_contents->GetController().PruneAllButLastCommitted();
-  NavigationEntry* active_entry =
-      view_source_contents->GetController().GetActiveEntry();
-  if (!active_entry)
+  NavigationEntry* entry =
+      view_source_contents->GetController().GetLastCommittedEntry();
+  if (!entry)
     return;
 
   GURL view_source_url =
       GURL(content::kViewSourceScheme + std::string(":") + url.spec());
-  active_entry->SetVirtualURL(view_source_url);
+  entry->SetVirtualURL(view_source_url);
 
   // Do not restore scroller position.
-  active_entry->SetPageState(page_state.RemoveScrollOffset());
+  entry->SetPageState(page_state.RemoveScrollOffset());
 
   // Do not restore title, derive it from the url.
-  active_entry->SetTitle(string16());
+  entry->SetTitle(string16());
 
   // Now show view-source entry.
   if (browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)) {
@@ -1143,7 +1142,7 @@ bool CanCreateApplicationShortcuts(const Browser* browser) {
 
 void ConvertTabToAppWindow(Browser* browser,
                            content::WebContents* contents) {
-  const GURL& url = contents->GetController().GetActiveEntry()->GetURL();
+  const GURL& url = contents->GetController().GetLastCommittedEntry()->GetURL();
   std::string app_name = web_app::GenerateApplicationNameFromURL(url);
 
   int index = browser->tab_strip_model()->GetIndexOfWebContents(contents);