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

chrome/browser/ui/search/search_tab_helper.cc

 // Copyright 2012 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/search/search_tab_helper.h"
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
@@ skipping 51 matching lines @@
 
 void RecordCacheableNTPLoadHistogram(bool succeeded) {
   UMA_HISTOGRAM_ENUMERATION("InstantExtended.CacheableNTPLoad",
                             succeeded ? CACHEABLE_NTP_LOAD_SUCCEEDED :
                                 CACHEABLE_NTP_LOAD_FAILED,
                             CACHEABLE_NTP_LOAD_MAX);
 }
 
 bool IsCacheableNTP(const content::WebContents* contents) {
   const content::NavigationEntry* entry =
-      contents->GetController().GetActiveEntry();
+      contents->GetController().GetLastCommittedEntry();

[Charlie Reis, 2013/11/12 01:09:29]

@sreeram: I see you specifically used GetVisibleEntry below in
http://crrev.com/182381.  Should this be using it as well?

[sreeram, 2013/11/12 09:01:26]

Based on the call sites below (i.e., where IsCacheableNTP() is called), it seems
to me that GetLastCommittedEntry() is correct. No need for GetVisibleEntry()
here.

[jww, 2013/11/12 22:32:50]

Done.

   return chrome::ShouldUseCacheableNTP() &&
       chrome::NavEntryIsInstantNTP(contents, entry) &&
       entry->GetURL() != GURL(chrome::kChromeSearchLocalNtpUrl);
 }
 
 bool IsNTP(const content::WebContents* contents) {
   // We can't use WebContents::GetURL() because that uses the active entry,
   // whereas we want the visible entry.
   const content::NavigationEntry* entry =
       contents->GetController().GetVisibleEntry();
@@ skipping 214 matching lines @@
   // resources. Normally, we set the title when we begin a NTP load, but it can
   // get reset in several places (like when you press Reload). This check
   // ensures that the title is properly set to the string defined by the Chrome
   // UI language (rather than the server language) in all cases.
   //
   // We only override the title when it's nonempty to allow the page to set the
   // title if it really wants. An empty title means to use the default. There's
   // also a race condition between this code and the page's SetTitle call which
   // this rule avoids.
   content::NavigationEntry* entry =
-      web_contents_->GetController().GetActiveEntry();
+      web_contents_->GetController().GetLastCommittedEntry();

[samarth, 2013/11/12 15:55:07]

Just to confirm, this will be the entry that "triggered" the call to
DidNavigateMainFrame?  The same question applies for the usage in
IsCacheableNTP.

[jww, 2013/11/12 22:32:50]

creis should confirm, but yes.

[Charlie Reis, 2013/11/13 18:40:03]

Yes, this is the entry that just committed as part of the DidNavigateMainFrame. 
There shouldn't be any way for it to change before we get here.

   if (entry && entry->GetTitle().empty() &&
       (entry->GetVirtualURL() == GURL(chrome::kChromeUINewTabURL) ||
        chrome::NavEntryIsInstantNTP(web_contents_, entry))) {
     entry->SetTitle(l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE));
   }
 }
 
 void SearchTabHelper::DidFailProvisionalLoad(
     int64 /* frame_id */,
     const string16& frame_unique_name,
@@ skipping 240 matching lines @@
 void SearchTabHelper::RedirectToLocalNTP() {
   // Extra parentheses to declare a variable.
   content::NavigationController::LoadURLParams load_params(
       (GURL(chrome::kChromeSearchLocalNtpUrl)));
   load_params.referrer = content::Referrer();
   load_params.transition_type = content::PAGE_TRANSITION_SERVER_REDIRECT;
   // Don't push a history entry.
   load_params.should_replace_current_entry = true;
   web_contents_->GetController().LoadURLWithParams(load_params);
 }