Move web_contents from SearchViewController to SearchTabHelper

chrome/browser/ui/search/search_tab_helper.h

Index: chrome/browser/ui/search/search_tab_helper.h
diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h
index e1a30716b2431953b73a46acc119b307a26f667f..4cad6a740c7b75539e3145e7940f5f3827046072 100644
--- a/chrome/browser/ui/search/search_tab_helper.h
+++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/ui/search/search_model.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -14,11 +15,13 @@
 class OmniboxEditModel;
 class TabContents;
 
+namespace content {
+class WebContents;
+};
+
 namespace chrome {
 namespace search {
 
-class SearchModel;
-
 // Per-tab search "helper".  Acts as the owner and controller of the tab's
 // search UI model.
 class SearchTabHelper : public content::WebContentsObserver,
@@ -27,10 +30,13 @@ class SearchTabHelper : public content::WebContentsObserver,
   SearchTabHelper(TabContents* contents, bool is_search_enabled);
   virtual ~SearchTabHelper();
 
-  SearchModel* model() const {
-    return model_.get();
+  SearchModel* model() {
+    return &model_;
   }
 
+  // Lazily create web contents for NTP.  Owned by SearchTabHelper.
+  content::WebContents* GetNTPWebContents();
+
   // Invoked when the OmniboxEditModel changes state in some way that might
   // affect the search mode.
   void OmniboxEditModelChanged(OmniboxEditModel* edit_model);
@@ -49,10 +55,16 @@ class SearchTabHelper : public content::WebContentsObserver,
   // Sets the mode of the model based on |url|.
   void UpdateModel(const GURL& url);
 
+  // On navigation away from NTP and Search pages, delete |ntp_web_contents_|.
+  void FlushNTP(const GURL& url);
+
   const bool is_search_enabled_;
 
   // Model object for UI that cares about search state.
-  scoped_ptr<SearchModel> model_;
+  SearchModel model_;
+
+  // Lazily created web contents for NTP.
+  scoped_ptr<content::WebContents> ntp_web_contents_;
 
   content::NotificationRegistrar registrar_;