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

chrome/browser/ui/search/instant_controller.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/instant_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
@@ skipping 43 matching lines @@
 void EnsureSearchTermsAreSet(content::WebContents* contents,
                              const string16& search_terms) {
   content::NavigationController* controller = &contents->GetController();
 
   // If search terms are already correct or there is already a transient entry
   // (there shouldn't be), bail out early.
   if (chrome::GetSearchTerms(contents) == search_terms ||
       controller->GetTransientEntry())
     return;
 
-  const content::NavigationEntry* active_entry = controller->GetActiveEntry();
+  const content::NavigationEntry* entry = controller->GetLastCommittedEntry();
   content::NavigationEntry* transient = controller->CreateNavigationEntry(
-      active_entry->GetURL(),
-      active_entry->GetReferrer(),
-      active_entry->GetTransitionType(),
+      entry->GetURL(),
+      entry->GetReferrer(),
+      entry->GetTransitionType(),
       false,
       std::string(),
       contents->GetBrowserContext());
   transient->SetExtraData(sessions::kSearchTermsKey, search_terms);
   controller->SetTransientEntry(transient);
 
   SearchTabHelper::FromWebContents(contents)->NavigationEntryUpdated();
 }
 
 }  // namespace
@@ skipping 224 matching lines @@
       content::PAGE_TRANSITION_SERVER_REDIRECT,
       std::string());  // No extra headers.
   // TODO(dcblack): Remove extraneous history entry caused by 404s.
   // Note that the base case of a 204 being returned doesn't push a history
   // entry.
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(profile());
 }