Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

chrome/browser/ui/cocoa/browser_window_cocoa.mm

 // 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.
 
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 209 matching lines @@
                                         forWindow:window()]);
 }
 
 void BrowserWindowCocoa::BookmarkBarStateChanged(
     BookmarkBar::AnimateChangeType change_type) {
   // TODO: route changes to state through this.
 }
 
 void BrowserWindowCocoa::UpdateDevTools() {
   [controller_ updateDevToolsForContents:
-      browser_->GetSelectedTabContents()];
+      browser_->GetSelectedWebContents()];
 }
 
 void BrowserWindowCocoa::SetDevToolsDockSide(DevToolsDockSide side) {
   [controller_ setDevToolsDockToRight:side == DEVTOOLS_DOCK_SIDE_RIGHT];
 }
 
 void BrowserWindowCocoa::UpdateLoadingAnimations(bool should_animate) {
   // Do nothing on Mac.
 }
 
@@ skipping 361 matching lines @@
 
   // at this point the controller is dead (autoreleased), so
   // make sure we don't try to reference it any more.
 }
 
 NSWindow* BrowserWindowCocoa::window() const {
   return [controller_ window];
 }
 
 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {
-  if (tab_contents == browser_->GetSelectedTabContents()) {
+  if (tab_contents == browser_->GetSelectedWebContents()) {
     [controller_ updateSidebarForContents:tab_contents];
   }
 }
 
 void BrowserWindowCocoa::ShowAvatarBubble(WebContents* web_contents,
                                           const gfx::Rect& rect) {
   NSView* view = web_contents->GetNativeView();
   NSRect bounds = [view bounds];
   NSPoint point;
   point.x = NSMinX(bounds) + rect.right();
   // The view's origin is at the bottom but |rect|'s origin is at the top.
   point.y = NSMaxY(bounds) - rect.bottom();
   point = [view convertPoint:point toView:nil];
   point = [[view window] convertBaseToScreen:point];
 
   // |menu| will automatically release itself on close.
   AvatarMenuBubbleController* menu =
       [[AvatarMenuBubbleController alloc] initWithBrowser:browser_
                                                anchoredAt:point];
   [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge];
   [menu showWindow:nil];
 }
 
 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() {
   [[controller_ avatarButtonController] showAvatarBubble];
 }