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

chrome/browser/instant/instant_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 70 matching lines @@
               const AutocompleteMatch& match,
               const string16& user_text,
               bool verbatim,
               string16* suggested_text);
 
   // Sets the bounds of the omnibox (in screen coordinates). The bounds are
   // remembered until the preview is committed or destroyed. This is only used
   // when showing results for a search provider that supports instant.
   void SetOmniboxBounds(const gfx::Rect& bounds);
 
-  // Destroys the preview TabContents. Does nothing if the preview TabContents
-  // has not been created.
+  // Notifies the delegate to hide the preview and destroys the preview
+  // TabContents. Does nothing if the preview TabContents has not been created.
   void DestroyPreviewContents();
 
-  // Destroys the current loaders but remains active.
-  void DestroyPreviewContentsAndLeaveActive();
+  // Notifies the delegate to hide the preview but leaves it around in hopes it
+  // can be subsequently used. The preview will not be used until Update() (with
+  // valid parameters) is invoked.
+  void Hide();
 
   // Returns true if we're showing the last URL passed to |Update|. If this is
   // false a commit does not result in committing the last url passed to update.
   // A return value of false happens if we're in the process of determining if
   // the page supports instant.
   bool IsCurrent();
 
   // Returns true if the caller should proceed with committing the preview. A
   // return value of false means that there is no valid preview to commit. This
   // is used by Browser, when the user presses <Enter>, to decide whether to
@@ skipping 35 matching lines @@
   // Does cleanup after the preview contents has been added to the tabstrip.
   // Invoke this if you explicitly invoke ReleasePreviewContents.
   void CompleteRelease(TabContentsWrapper* tab);
 
   // TabContents the match is being shown for.
   TabContentsWrapper* tab_contents() const { return tab_contents_; }
 
   // The preview TabContents; may be null.
   TabContentsWrapper* GetPreviewContents();
 
-  // Returns true if |Update| has been invoked without a corresponding call to
-  // |DestroyPreviewContents| or |CommitCurrentPreview|.
-  bool is_active() const { return is_active_; }
-
   // Returns true if the preview TabContents is ready to be displayed. In some
   // situations this may return false yet GetPreviewContents() returns non-NULL.
   bool is_displayable() const { return is_displayable_; }
 
   // Returns the transition type of the last AutocompleteMatch passed to Update.
   content::PageTransition last_transition_type() const {
     return last_transition_type_;
   }
 
   // InstantLoaderDelegate
@@ skipping 52 matching lines @@
   void ScheduleDestroy(InstantLoader* loader);
 
   // Destroys all loaders scheduled for destruction in |ScheduleForDestroy|.
   void DestroyLoaders();
 
   InstantDelegate* delegate_;
 
   // The TabContents last passed to |Update|.
   TabContentsWrapper* tab_contents_;
 
-  // See description above getter for details.
-  bool is_active_;
-
-  scoped_ptr<InstantLoader> loader_;
-
   // True if |loader_| is ready to be displayed.
   bool is_displayable_;
 
+  // Set to true in Hide() and false in UpdateLoader(). Used when we persist
+  // the |loader_|, but it isn't up to date.
+  bool is_out_of_date_;
+
+  scoped_ptr<InstantLoader> loader_;
+
   // See description above setter.
   gfx::Rect omnibox_bounds_;
 
   // See description above CommitOnMouseUp.
   bool commit_on_mouse_up_;
 
   // See description above getter.
   content::PageTransition last_transition_type_;
 
   // The IDs of any search engines that don't support instant. We assume all
@@ skipping 11 matching lines @@
   // The URL of the most recent match passed to |Update|.
   GURL last_url_;
 
   // The most recent user_text passed to |Update|.
   string16 last_user_text_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_