Cleanup in components/search and chrome/browser/search

chrome/browser/search/instant_service.cc

 // Copyright 2013 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/search/instant_service.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
@@ skipping 484 matching lines @@
   DCHECK_EQ(top_sites_.get(), top_sites);
   // As forced urls already come from tiles, we can safely ignore those updates.
   if (change_reason == history::TopSitesObserver::ChangeReason::FORCED_URL)
     return;
   top_sites_->GetMostVisitedURLs(base::Bind(&InstantService::OnTopSitesReceived,
                                             weak_ptr_factory_.GetWeakPtr()),
                                  false);
 }
 
 void InstantService::ResetInstantSearchPrerendererIfNecessary() {
-  if (!search::ShouldPrefetchSearchResults())
+  if (!search::IsInstantExtendedAPIEnabled())
     return;
 
   GURL url(search::GetSearchResultPrefetchBaseURL(profile_));
   if (!instant_prerenderer_ || instant_prerenderer_->prerender_url() != url) {
     instant_prerenderer_.reset(
         url.is_valid() ? new InstantSearchPrerenderer(profile_, url) : nullptr);
   }
 }