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

chrome/browser/task_manager/tab_contents_resource_provider.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/task_manager/tab_contents_resource_provider.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/search/instant_service.h"
-#include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/task_manager/renderer_resource.h"
 #include "chrome/browser/task_manager/resource_provider.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/task_manager/task_manager_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
@@ skipping 54 matching lines @@
   virtual content::WebContents* GetWebContents() const OVERRIDE;
   virtual const extensions::Extension* GetExtension() const OVERRIDE;
 
  private:
   // Returns true if contains content rendered by an extension.
   bool HostsExtension() const;
 
   static gfx::ImageSkia* prerender_icon_;
   content::WebContents* web_contents_;
   Profile* profile_;
-  bool is_instant_ntp_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsResource);
 };
 
 gfx::ImageSkia* TabContentsResource::prerender_icon_ = NULL;
 
 TabContentsResource::TabContentsResource(
     WebContents* web_contents)
     : RendererResource(web_contents->GetRenderProcessHost()->GetHandle(),
                        web_contents->GetRenderViewHost()),
       web_contents_(web_contents),
-      profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())),
-      is_instant_ntp_(chrome::IsPreloadedInstantExtendedNTP(web_contents)) {
+      profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())) {
   if (!prerender_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     prerender_icon_ = rb.GetImageSkiaNamed(IDR_PRERENDER);
   }
 }
 
 TabContentsResource::~TabContentsResource() {
 }
 
 bool TabContentsResource::HostsExtension() const {
@@ skipping 15 matching lines @@
   ExtensionService* extension_service = profile_->GetExtensionService();
   extensions::ProcessMap* process_map = extension_service->process_map();
   bool is_app = extension_service->IsInstalledApp(url) &&
       process_map->Contains(web_contents_->GetRenderProcessHost()->GetID());
 
   int message_id = util::GetMessagePrefixID(
       is_app,
       HostsExtension(),
       profile_->IsOffTheRecord(),
       IsContentsPrerendering(web_contents_),
-      is_instant_ntp_,
       false);  // is_background
   return l10n_util::GetStringFUTF16(message_id, tab_title);
 }
 
 base::string16 TabContentsResource::GetProfileName() const {
   return util::GetProfileNameFromInfoCache(profile_);
 }
 
 gfx::ImageSkia TabContentsResource::GetIcon() const {
   if (IsContentsPrerendering(web_contents_))
@@ skipping 78 matching lines @@
     prerender::PrerenderManager* prerender_manager =
         prerender::PrerenderManagerFactory::GetForProfile(profiles[i]);
     if (prerender_manager) {
       const std::vector<content::WebContents*> contentses =
           prerender_manager->GetAllPrerenderingContents();
       for (size_t j = 0; j < contentses.size(); ++j)
         Add(contentses[j]);
     }
   }
 
-  // Add all the Instant Extended prerendered NTPs.
-  for (size_t i = 0; i < profiles.size(); ++i) {
-    const InstantService* instant_service =
-        InstantServiceFactory::GetForProfile(profiles[i]);
-    if (instant_service && instant_service->GetNTPContents())
-      Add(instant_service->GetNTPContents());
-  }
-
 #if defined(ENABLE_FULL_PRINTING)
   // Add all the pages being background printed.
   printing::BackgroundPrintingManager* printing_manager =
       g_browser_process->background_printing_manager();
   std::set<content::WebContents*> printing_contents =
       printing_manager->CurrentContentSet();
   for (std::set<content::WebContents*>::iterator i =
            printing_contents.begin();
        i != printing_contents.end(); ++i) {
     Add(*i);
@@ skipping 35 matching lines @@
 
 void TabContentsResourceProvider::Add(WebContents* web_contents) {
   if (!updating_)
     return;
 
   // The contents that are tracked by this resource provider are those that
   // are tab contents (WebContents serving as a tab in a Browser), Instant
   // pages, prerender pages, and background printed pages.
   if (!chrome::FindBrowserWithWebContents(web_contents) &&
       !IsContentsPrerendering(web_contents) &&
-      !chrome::IsPreloadedInstantExtendedNTP(web_contents) &&
       !IsContentsBackgroundPrinted(web_contents) &&
       !DevToolsWindow::IsDevToolsWindow(web_contents->GetRenderViewHost())) {
     return;
   }
 
   // Don't add dead tabs or tabs that haven't yet connected.
   if (!web_contents->GetRenderProcessHost()->GetHandle() ||
       !web_contents->WillNotifyDisconnection()) {
     return;
   }
@@ skipping 47 matching lines @@
     case content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED:
       Remove(web_contents);
       break;
     default:
       NOTREACHED() << "Unexpected notification.";
       return;
   }
 }
 
 }  // namespace task_manager