Remove Instant v1 API.

chrome/browser/instant/instant_unload_handler.cc

 // Copyright (c) 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/instant/instant_unload_handler.h"
 
-#include <algorithm>
-
-#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 // WebContentsDelegate implementation. This owns the TabContents supplied to the
 // constructor.
 class InstantUnloadHandler::WebContentsDelegateImpl
     : public content::WebContentsDelegate {
@@ skipping 72 matching lines @@
 }
 
 void InstantUnloadHandler::Activate(WebContentsDelegateImpl* delegate) {
   // Take ownership of the TabContents from the delegate.
   TabContents* tab = delegate->ReleaseTab();
   chrome::NavigateParams params(browser_, tab);
   params.disposition = NEW_FOREGROUND_TAB;
   params.tabstrip_index = delegate->index();
 
   // Remove (and delete) the delegate.
-  ScopedVector<WebContentsDelegateImpl>::iterator i =
-      std::find(delegates_.begin(), delegates_.end(), delegate);
-  DCHECK(i != delegates_.end());
-  delegates_.erase(i);
-  delegate = NULL;
+  Destroy(delegate);
 
   // Add the tab back in.
   chrome::Navigate(&params);
 }
 
 void InstantUnloadHandler::Destroy(WebContentsDelegateImpl* delegate) {
   ScopedVector<WebContentsDelegateImpl>::iterator i =
       std::find(delegates_.begin(), delegates_.end(), delegate);
   DCHECK(i != delegates_.end());
   delegates_.erase(i);
 }