(Try 2) InstantExtended: remove dead code related to the non-cacheable NTP.

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 <vector>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ skipping 49 matching lines @@
   color.g = SkColorGetG(sKColor);
   color.b = SkColorGetB(sKColor);
   color.a = SkColorGetA(sKColor);
   return color;
 }
 
 }  // namespace
 
 InstantService::InstantService(Profile* profile)
     : profile_(profile),
-      ntp_prerenderer_(profile, this, profile->GetPrefs()),
-      browser_instant_controller_object_count_(0),
       weak_ptr_factory_(this) {
   // Stub for unit tests.
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI))
     return;
 
   ResetInstantSearchPrerenderer();
 
   registrar_.Add(this,
                  content::NOTIFICATION_RENDERER_PROCESS_CREATED,
                  content::NotificationService::AllSources());
@@ skipping 35 matching lines @@
   content::URLDataSource::Add(profile_, new MostVisitedIframeSource());
 
   profile_pref_registrar_.Init(profile_->GetPrefs());
   profile_pref_registrar_.Add(
       prefs::kDefaultSearchProviderID,
       base::Bind(&InstantService::OnDefaultSearchProviderChanged,
                  base::Unretained(this)));
 
   registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
                  content::Source<Profile>(profile_->GetOriginalProfile()));
-  registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
-                 content::Source<Profile>(profile_));
 }
 
 InstantService::~InstantService() {
 }
 
 void InstantService::AddInstantProcess(int process_id) {
   process_ids_.insert(process_id);
 
   if (instant_io_context_.get()) {
     BrowserThread::PostTask(BrowserThread::IO,
@@ skipping 59 matching lines @@
   if (instant_io_context_.get()) {
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&InstantIOContext::ClearInstantProcessesOnIO,
                    instant_io_context_));
   }
   instant_io_context_ = NULL;
 }
 
-scoped_ptr<content::WebContents> InstantService::ReleaseNTPContents() {
-  return ntp_prerenderer_.ReleaseNTPContents();
-}
-
-content::WebContents* InstantService::GetNTPContents() const {
-  return ntp_prerenderer_.GetNTPContents();
-}
-
-void InstantService::OnBrowserInstantControllerCreated() {
-  if (profile_->IsOffTheRecord())
-    return;
-
-  ++browser_instant_controller_object_count_;
-
-  if (browser_instant_controller_object_count_ == 1)
-    ntp_prerenderer_.ReloadInstantNTP();
-}
-
-void InstantService::OnBrowserInstantControllerDestroyed() {
-  if (profile_->IsOffTheRecord())
-    return;
-
-  DCHECK_GT(browser_instant_controller_object_count_, 0U);
-  --browser_instant_controller_object_count_;
-
-  // All browser windows have closed, so release the InstantNTP resources to
-  // work around http://crbug.com/180810.
-  if (browser_instant_controller_object_count_ == 0)
-    ntp_prerenderer_.DeleteNTPContents();
-}
-
 void InstantService::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_RENDERER_PROCESS_CREATED:
       SendSearchURLsToRenderer(
           content::Source<content::RenderProcessHost>(source).ptr());
       break;
     case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED:
       OnRendererProcessTerminated(
           content::Source<content::RenderProcessHost>(source)->GetID());
       break;
     case chrome::NOTIFICATION_TOP_SITES_CHANGED: {
       history::TopSites* top_sites = profile_->GetTopSites();
       if (top_sites) {
         top_sites->GetMostVisitedURLs(
             base::Bind(&InstantService::OnMostVisitedItemsReceived,
                        weak_ptr_factory_.GetWeakPtr()), false);
       }
       break;
     }
 #if defined(ENABLE_THEMES)
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       OnThemeChanged(content::Source<ThemeService>(source).ptr());
       break;
     }
 #endif  // defined(ENABLE_THEMES)
-    case chrome::NOTIFICATION_PROFILE_DESTROYED: {
-      // Last chance to delete InstantNTP contents. We generally delete
-      // preloaded InstantNTP when the last BrowserInstantController object is
-      // destroyed. When the browser shutdown happens without closing browsers,
-      // there is a race condition between BrowserInstantController destruction
-      // and Profile destruction.
-      if (GetNTPContents())
-        ntp_prerenderer_.DeleteNTPContents();
-      break;
-    }
     case chrome::NOTIFICATION_GOOGLE_URL_UPDATED: {
       OnGoogleURLUpdated(
           content::Source<Profile>(source).ptr(),
           content::Details<GoogleURLTracker::UpdatedDetails>(details).ptr());
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type in InstantService.";
   }
 }
@@ skipping 183 matching lines @@
     // could cause that, neither of which we support.
     return;
   }
 
   ResetInstantSearchPrerenderer();
 
   FOR_EACH_OBSERVER(
       InstantServiceObserver, observers_, DefaultSearchProviderChanged());
 }
 
-InstantNTPPrerenderer* InstantService::ntp_prerenderer() {
-  return &ntp_prerenderer_;
-}
-
 void InstantService::ResetInstantSearchPrerenderer() {
   if (!chrome::ShouldPrefetchSearchResults())
     return;
 
   GURL url(chrome::GetSearchResultPrefetchBaseURL(profile_));
   if (url.is_valid())
     instant_prerenderer_.reset(new InstantSearchPrerenderer(profile_, url));
   else
     instant_prerenderer_.reset();
 }