Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc

 // 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.
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/time.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/favicon_url.h"
 #include "chrome/common/icon_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "net/test/test_server.h"
@@ skipping 59 matching lines @@
   void CreatePanelBrowser(const char* url, Browser** result) {
     Browser* panel_browser =  Browser::CreateWithParams(
         Browser::CreateParams::CreateForApp(
             Browser::TYPE_PANEL, "Test Panel", gfx::Rect(),
             browser()->profile()));
     EXPECT_TRUE(panel_browser->is_type_panel());
     ASSERT_EQ(static_cast<void*>(NULL), contents_observer_.get());
     // Load initial tab contents before setting the observer.
     ui_test_utils::NavigateToURL(panel_browser, GURL());
     contents_observer_.reset(
-        new ContentsObserver(panel_browser->GetWebContentsAt(0)));
+        new ContentsObserver(chrome::GetWebContentsAt(panel_browser, 0)));
     NavigateTo(panel_browser, url);
     *result = panel_browser;
   }
 
   LauncherFaviconLoader* GetFaviconLoader(Browser* browser) {
     BrowserView* browser_view = static_cast<BrowserView*>(browser->window());
     BrowserLauncherItemController* launcher_item_controller =
         browser_view->launcher_item_controller();
     if (!launcher_item_controller)
       return NULL;
@@ skipping 87 matching lines @@
   NavigateTo(panel_browser, "launcher-smallfavicon.html");
   EXPECT_TRUE(WaitForFaviconDownlads(1));
   EXPECT_TRUE(favicon_loader->GetFavicon().empty());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   NavigateTo(panel_browser, "launcher-largefavicon.html");
   EXPECT_TRUE(WaitForFaviconDownlads(1));
   EXPECT_FALSE(favicon_loader->GetFavicon().empty());
   EXPECT_EQ(128, favicon_loader->GetFavicon().height());
 }