Use Chrome facilities for omnibox state save and restore on Mac.

chrome/browser/cocoa/browser_window_controller.mm

 // Copyright (c) 2009 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 "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"  // IDC_*
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ skipping 272 matching lines @@
 - (LocationBar*)locationBar {
   return [toolbarController_ locationBar];
 }
 
 - (StatusBubble*)statusBubble {
   return statusBubble_.get();
 }
 
 - (void)updateToolbarWithContents:(TabContents*)tab
                shouldRestoreState:(BOOL)shouldRestore {
-  [toolbarController_ updateToolbarWithContents:shouldRestore ? tab : NULL];
+  [toolbarController_ updateToolbarWithContents:tab
+                             shouldRestoreState:shouldRestore];
 }
 
 - (void)setStarredState:(BOOL)isStarred {
   [toolbarController_ setStarredState:isStarred];
 }
 
 // Return the rect, in WebKit coordinates (flipped), of the window's grow box
 // in the coordinate system of the content area of the currently selected tab.
 // |windowGrowBox| needs to be in the window's coordinate system.
 - (NSRect)selectedTabGrowBoxRect {
@@ skipping 288 matching lines @@
 - (NSArray*)viewsToMoveToOverlay {
   NSArray* views = [super viewsToMoveToOverlay];
   NSArray* browserViews =
       [NSArray arrayWithObjects:[toolbarController_ view],
                                 [bookmarkController_ view],
                                 nil];
   return [views arrayByAddingObjectsFromArray:browserViews];
 }
 
 @end