Really forward declare FullscreenController in browser.h

This is a follow up to crrev.com/110886

BUG=100682
R=pkasting@chromium.org
TBR=akalin@chromium.org

Review URL: http://codereview.chromium.org/9008003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115184 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 22 insertions, 22 deletions

diff --git a/chrome/browser/sync/sync_setup_wizard_unittest.cc b/chrome/browser/sync/sync_setup_wizard_unittest.cc
index f183880..d77b2ec 100644
--- a/chrome/browser/sync/sync_setup_wizard_unittest.cc
+++ b/chrome/browser/sync/sync_setup_wizard_unittest.cc
@@ -208,7 +208,7 @@ class SyncSetupWizardTest : public BrowserWithTestWindowTest {
     prefs->SetString(prefs::kGoogleServicesUsername, kTestUser);
 
     set_browser(new Browser(Browser::TYPE_TABBED, profile()));
-    browser()->set_window(window());
+    browser()->SetWindowForTesting(window());
     BrowserList::SetLastActive(browser());
     service_ = static_cast<ProfileSyncServiceForWizardTest*>(
         profile()->GetProfileSyncService());
diff --git a/chrome/browser/tabs/pinned_tab_service_unittest.cc b/chrome/browser/tabs/pinned_tab_service_unittest.cc
index a1ede00..f1fcc37 100644
--- a/chrome/browser/tabs/pinned_tab_service_unittest.cc
+++ b/chrome/browser/tabs/pinned_tab_service_unittest.cc
@@ -41,7 +41,7 @@ TEST_F(PinnedTabServiceTest, Popup) {
   scoped_ptr<Browser> popup(new Browser(Browser::TYPE_POPUP, profile()));
   scoped_ptr<TestBrowserWindow> popup_window(
       new TestBrowserWindow(popup.get()));
-  popup->set_window(popup_window.get());
+  popup->SetWindowForTesting(popup_window.get());
 
   // Close the browser. This should trigger saving the tabs.
   browser()->OnWindowClosing();
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index af52ebb..3b54f7d 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -106,6 +106,7 @@
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
+#include "chrome/browser/ui/fullscreen_controller.h"
 #include "chrome/browser/ui/global_error.h"
 #include "chrome/browser/ui/global_error_service.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
@@ -568,6 +569,12 @@ void Browser::InitBrowserWindow() {
     NewTabPageHandler::DismissIntroMessage(local_state);
 }
 
+void Browser::SetWindowForTesting(BrowserWindow* window) {
+  DCHECK(!window_);
+  window_ = window;
+  fullscreen_controller_ = new FullscreenController(window_, profile_, this);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Getters & Setters
 
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 7fc0229..5e4ce47 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -36,7 +36,6 @@
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
 #include "chrome/browser/ui/dialog_style.h"
-#include "chrome/browser/ui/fullscreen_controller.h"
 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
 #include "chrome/browser/ui/select_file_dialog.h"
@@ -208,6 +207,11 @@ class Browser : public TabHandlerDelegate,
   // to show it.
   void InitBrowserWindow();
 
+  // Sets the BrowserWindow. This is intended for tests only.
+  // Use CreateBrowserWindow outside of testing, or the static convenience
+  // methods that create a BrowserWindow for you.
+  void SetWindowForTesting(BrowserWindow* window);
+
   // Accessors ////////////////////////////////////////////////////////////////
 
   Type type() const { return type_; }
@@ -219,17 +223,6 @@ class Browser : public TabHandlerDelegate,
   // this Browser.
   InstantController* instant() const { return instant_.get(); }
 
-#if defined(UNIT_TEST)
-  // Sets the BrowserWindow. This is intended for testing and generally not
-  // useful outside of testing. Use CreateBrowserWindow outside of testing, or
-  // the static convenience methods that create a BrowserWindow for you.
-  void set_window(BrowserWindow* window) {
-    DCHECK(!window_);
-    window_ = window;
-    fullscreen_controller_ = new FullscreenController(window_, profile_, this);
-  }
-#endif
-
   // |window()| will return NULL if called before |CreateBrowserWindow()|
   // is done.
   BrowserWindow* window() const { return window_; }
diff --git a/chrome/browser/ui/browser_list_unittest.cc b/chrome/browser/ui/browser_list_unittest.cc
index 7cff8a5..0789bef 100644
--- a/chrome/browser/ui/browser_list_unittest.cc
+++ b/chrome/browser/ui/browser_list_unittest.cc
@@ -53,9 +53,9 @@ TEST_F(BrowserListTest, TabContentsIteratorVerifyCount) {
   scoped_ptr<TestBrowserWindow> window3(new TestBrowserWindow(browser3.get()));
   scoped_ptr<TestBrowserWindow> window4(new TestBrowserWindow(browser4.get()));
 
-  browser2->set_window(window2.get());
-  browser3->set_window(window3.get());
-  browser4->set_window(window4.get());
+  browser2->SetWindowForTesting(window2.get());
+  browser3->SetWindowForTesting(window3.get());
+  browser4->SetWindowForTesting(window4.get());
 
   // Sanity checks.
   EXPECT_EQ(4U, BrowserList::size());
@@ -98,8 +98,8 @@ TEST_F(BrowserListTest, TabContentsIteratorVerifyBrowser) {
   scoped_ptr<TestBrowserWindow> window2(new TestBrowserWindow(browser2.get()));
   scoped_ptr<TestBrowserWindow> window3(new TestBrowserWindow(browser3.get()));
 
-  browser2->set_window(window2.get());
-  browser3->set_window(window3.get());
+  browser2->SetWindowForTesting(window2.get());
+  browser3->SetWindowForTesting(window3.get());
 
   // Sanity checks.
   EXPECT_EQ(3U, BrowserList::size());
@@ -169,8 +169,8 @@ TEST_F(BrowserListTest, TabContentsIteratorBackgroundPrinting) {
   scoped_ptr<TestBrowserWindow> window2(new TestBrowserWindow(browser2.get()));
   scoped_ptr<TestBrowserWindow> window3(new TestBrowserWindow(browser3.get()));
 
-  browser2->set_window(window2.get());
-  browser3->set_window(window3.get());
+  browser2->SetWindowForTesting(window2.get());
+  browser3->SetWindowForTesting(window3.get());
 
   EXPECT_EQ(0U, CountAllTabs());
 
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index 3027c13..2c7850a 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -39,7 +39,7 @@ void BrowserWithTestWindowTest::SetUp() {
   profile_.reset(CreateProfile());
   browser_.reset(new Browser(Browser::TYPE_TABBED, profile()));
   window_.reset(new TestBrowserWindow(browser()));
-  browser_->set_window(window_.get());
+  browser_->SetWindowForTesting(window_.get());
 }
 
 BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {