Move web_contents from SearchViewController to SearchTabHelper

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 5274cff7c634abf3288f605b3343a568330f84e0..3ab81d3ff9ab13031cf8900c3dbdef18336e1c73 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -2495,7 +2495,6 @@ void BrowserView::ProcessTabSelected(TabContents* new_contents) {
   if (search_view_controller_.get())
     search_view_controller_->SetTabContents(new_contents);
 #endif
-  RestackLocationBarContainer();
 
   UpdateDevToolsForContents(new_contents);
   if (!browser_->tab_strip_model()->closing_all() && GetWidget()->IsActive() &&
@@ -2507,6 +2506,12 @@ void BrowserView::ProcessTabSelected(TabContents* new_contents) {
 
   // Update all the UI bits.
   UpdateTitleBar();
+
+  // Restacking needs to happen after other UI updates. This restores special
+  // "widget" stacking that governs the SearchViewController's NTP "content"
+  // area.
+  RestackLocationBarContainer();
+
   // No need to update Toolbar because it's already updated in
   // browser.cc.
 }