Fix multiple problems with omnibox text handling across focus changes.

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

Index: chrome/browser/ui/views/frame/browser_view.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_view.cc	(revision 224205)
+++ chrome/browser/ui/views/frame/browser_view.cc	(working copy)
@@ -1444,8 +1444,12 @@
   // Update all the UI bits.
   UpdateTitleBar();
 
-  // No need to update Toolbar because it's already updated in
-  // browser.cc.
+  // Let the browser do any necessary handling.  This must be called after
+  // changing focus above, so that when the toolbar (and thus omnibox) is
+  // updated, the correct view already has focus; changing focus after restoring
+  // omnibox state can overwrite important bits of state.  See comments in
+  // OmniboxViewViews::OnTabChanged().
+  browser_->OnActiveTabChanged(old_contents, new_contents, index, reason);
 }
 
 void BrowserView::TabStripEmpty() {