Fixes bug in instant where we would end up incorrectly using the

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 3147 matching lines @@
 }
 
 void Browser::TabDetachedAt(TabContentsWrapper* contents, int index) {
   TabDetachedAtImpl(contents, index, DETACH_TYPE_DETACH);
 }
 
 void Browser::TabDeactivated(TabContentsWrapper* contents) {
   if (contents == fullscreened_tab_)
     ExitTabbedFullscreenModeIfNecessary();
   if (instant())
-    instant()->DestroyPreviewContentsAndLeaveActive();
+    instant()->Hide();
 
   // Save what the user's currently typing, so it can be restored when we
   // switch back to this tab.
   window_->GetLocationBar()->SaveStateToContents(contents->tab_contents());
 }
 
 void Browser::ActiveTabChanged(TabContentsWrapper* old_contents,
                                TabContentsWrapper* new_contents,
                                int index,
                                bool user_gesture) {
@@ skipping 968 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, InstantDelegate implementation:
 
 void Browser::ShowInstant(TabContentsWrapper* preview_contents) {
   DCHECK(instant_->tab_contents() == GetSelectedTabContentsWrapper());
   window_->ShowInstant(preview_contents);
 }
 
 void Browser::HideInstant() {
-  window_->HideInstant(instant_->is_active());
+  window_->HideInstant();
 }
 
 void Browser::CommitInstant(TabContentsWrapper* preview_contents) {
   TabContentsWrapper* tab_contents = instant_->tab_contents();
   int index =
       tab_handler_->GetTabStripModel()->GetIndexOfTabContents(tab_contents);
   DCHECK_NE(TabStripModel::kNoTab, index);
   // TabStripModel takes ownership of preview_contents.
   tab_handler_->GetTabStripModel()->ReplaceTabContentsAt(
       index, preview_contents);
@@ skipping 927 matching lines @@
     const TabContents* base_tab_contents,
     SessionStorageNamespace* session_storage_namespace) {
   TabContents* new_contents = new TabContents(profile, site_instance,
                                               routing_id, base_tab_contents,
                                               session_storage_namespace);
   TabContentsWrapper* wrapper = new TabContentsWrapper(new_contents);
   return wrapper;
 }
 
 bool Browser::OpenInstant(WindowOpenDisposition disposition) {
-  if (!instant() || !instant()->is_active() || !instant()->PrepareForCommit() ||
+  if (!instant() || !instant()->PrepareForCommit() ||
       disposition == NEW_BACKGROUND_TAB) {
     // NEW_BACKGROUND_TAB results in leaving the omnibox open, so we don't
     // attempt to use the instant preview.
     return false;
   }
 
   if (disposition == CURRENT_TAB) {
     NotificationService::current()->Notify(
         chrome::NOTIFICATION_INSTANT_COMMITTED,
         Source<TabContentsWrapper>(instant()->CommitCurrentPreview(
@@ skipping 190 matching lines @@
     window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
   } else if (is_type_tabbed()) {
     GlobalErrorService* service =
         GlobalErrorServiceFactory::GetForProfile(profile());
     GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
     if (error) {
       error->ShowBubbleView(this);
     }
   }
 }