Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "ipc/ipc_message.h"
@@ skipping 39 matching lines @@
     EXPECT_TRUE([controller_ window]);
   }
 
   virtual void TearDown() {
     [controller_ close];
     controller_.reset();
     CocoaProfileTest::TearDown();
   }
 
   void AppendTabToStrip() {
-    TabContents* tab_contents = Browser::TabContentsFactory(
-        profile(), site_instance_, MSG_ROUTING_NONE,
-        NULL, NULL);
+    TabContents* tab_contents = chrome::TabContentsFactory(
+        profile(), site_instance_, MSG_ROUTING_NONE, NULL, NULL);
     browser()->tab_strip_model()->AppendTabContents(
         tab_contents, /*foreground=*/true);
   }
 
   scoped_refptr<SiteInstance> site_instance_;
   scoped_nsobject<FullscreenExitBubbleController> controller_;
 };
 
 TEST_F(FullscreenExitBubbleControllerTest, DenyExitsFullscreen) {
   CreateBrowserWindow();
   NSWindow* window = browser()->window()->GetNativeWindow();
   BrowserWindowController* bwc = [BrowserWindowController
       browserWindowControllerForWindow:window];
 
   [bwc showWindow:nil];
 
   AppendTabToStrip();
-  WebContents* fullscreen_tab = browser()->GetActiveWebContents();
+  WebContents* fullscreen_tab = chrome::GetActiveWebContents(browser());
   {
     base::mac::ScopedNSAutoreleasePool pool;
     ui_test_utils::WindowedNotificationObserver fullscreen_observer(
         chrome::NOTIFICATION_FULLSCREEN_CHANGED,
         content::NotificationService::AllSources());
     browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
     fullscreen_observer.Wait();
     ASSERT_TRUE(browser()->window()->IsFullscreen());
   }
 
@@ skipping 19 matching lines @@
 TEST_F(FullscreenExitBubbleControllerTest, ShortcutText) {
   ui::AcceleratorCocoa cmd_F(@"F", NSCommandKeyMask);
   ui::AcceleratorCocoa cmd_shift_f(@"f", NSCommandKeyMask|NSShiftKeyMask);
   NSString* cmd_F_text = [FullscreenExitBubbleController
       keyCombinationForAccelerator:cmd_F];
   NSString* cmd_shift_f_text = [FullscreenExitBubbleController
       keyCombinationForAccelerator:cmd_shift_f];
   EXPECT_NSEQ(cmd_shift_f_text, cmd_F_text);
   EXPECT_NSEQ(@"\u2318\u21E7F", cmd_shift_f_text);
 }