Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/speech/speech_recognition_bubble_controller_unittest.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 "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/speech/speech_recognition_bubble_controller.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 
 using content::BrowserThread;
 using content::WebContents;
 
@@ skipping 127 matching lines @@
     // active.
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(&ActivateBubble));
 
     // The |tab_contents| parameter would be NULL since the dummy session id
     // passed to CreateBubble would not have matched any active tab. So get a
     // real WebContents pointer from the test fixture and pass that, because
     // the bubble controller registers for tab close notifications which need
     // a valid WebContents.
     TabContents* tab_contents =
-        test_fixture_->browser()->GetActiveTabContents();
+        chrome::GetActiveTabContents(test_fixture_->browser());
     if (tab_contents)
       web_contents = tab_contents->web_contents();
     return new MockSpeechRecognitionBubble(web_contents, delegate,
                                            element_rect);
   }
 
  protected:
   // The main thread of the test is marked as the IO thread and we create a new
   // one for the UI thread.
   content::TestBrowserThread io_thread_;
@@ skipping 50 matching lines @@
 
   controller_->CreateBubble(kBubbleSessionId, 1, 1, gfx::Rect(1, 1));
   MessageLoop::current()->Run();
   EXPECT_FALSE(cancel_clicked_);
   EXPECT_TRUE(try_again_clicked_);
   EXPECT_FALSE(focus_changed_);
   controller_->CloseBubble(kBubbleSessionId);
 }
 
 }  // namespace speech