Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/automation/automation_util.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 "chrome/browser/automation/automation_util.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/automation_id.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
@@ skipping 101 matching lines @@
     return NULL;
   return *(BrowserList::begin() + index);
 }
 
 WebContents* GetWebContentsAt(int browser_index, int tab_index) {
   if (tab_index < 0)
     return NULL;
   Browser* browser = GetBrowserAt(browser_index);
   if (!browser || tab_index >= browser->tab_count())
     return NULL;
-  return browser->GetWebContentsAt(tab_index);
+  return chrome::GetWebContentsAt(browser, tab_index);
 }
 
 Browser* GetBrowserForTab(WebContents* tab) {
   BrowserList::const_iterator browser_iter = BrowserList::begin();
   for (; browser_iter != BrowserList::end(); ++browser_iter) {
     Browser* browser = *browser_iter;
     for (int tab_index = 0; tab_index < browser->tab_count(); ++tab_index) {
-      if (browser->GetWebContentsAt(tab_index) == tab)
+      if (chrome::GetWebContentsAt(browser, tab_index) == tab)
         return browser;
     }
   }
   return NULL;
 }
 
 net::URLRequestContextGetter* GetRequestContext(WebContents* contents) {
   // Since we may be on the UI thread don't call GetURLRequestContext().
   // Get the request context specific to the current WebContents and app.
   return contents->GetBrowserContext()->GetRequestContextForRenderProcess(
@@ skipping 278 matching lines @@
 bool GetTabForId(const AutomationId& id, WebContents** tab) {
   if (id.type() != AutomationId::kTypeTab)
     return false;
 
   printing::PrintPreviewTabController* preview_controller =
       printing::PrintPreviewTabController::GetInstance();
   BrowserList::const_iterator iter = BrowserList::begin();
   for (; iter != BrowserList::end(); ++iter) {
     Browser* browser = *iter;
     for (int tab_index = 0; tab_index < browser->tab_count(); ++tab_index) {
-      TabContents* tab_contents = browser->GetTabContentsAt(tab_index);
+      TabContents* tab_contents = chrome::GetTabContentsAt(browser, tab_index);
       if (base::IntToString(
               tab_contents->restore_tab_helper()->session_id().id()) ==
                   id.id()) {
         *tab = tab_contents->web_contents();
         return true;
       }
       if (preview_controller) {
         TabContents* preview_tab_contents =
             preview_controller->GetPrintPreviewForTab(tab_contents);
         if (preview_tab_contents) {
@@ skipping 88 matching lines @@
       const extensions::Extension* extension;
       return GetExtensionForId(id, profile, &extension);
     }
     default:
       break;
   }
   return false;
 }
 
 }  // namespace automation_util