Print Preview: Use the global PrintPreviewTabController in unit tests.

BUG=none
TEST=none

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

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

5 files changed, 18 insertions, 13 deletions

diff --git a/chrome/browser/printing/print_preview_tab_controller_unittest.cc b/chrome/browser/printing/print_preview_tab_controller_unittest.cc
index 7e98692..1a01af0 100644
--- a/chrome/browser/printing/print_preview_tab_controller_unittest.cc
+++ b/chrome/browser/printing/print_preview_tab_controller_unittest.cc
@@ -41,8 +41,8 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_GetOrCreatePreviewTab) {
   TabContentsWrapper* initiator_tab =
       browser()->GetSelectedTabContentsWrapper();
 
-  scoped_refptr<printing::PrintPreviewTabController>
-      tab_controller(new printing::PrintPreviewTabController());
+  printing::PrintPreviewTabController* tab_controller =
+      printing::PrintPreviewTabController::GetInstance();
   ASSERT_TRUE(tab_controller);
 
   // Get the preview tab for initiator tab.
@@ -93,8 +93,8 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_MultiplePreviewTabs) {
   ASSERT_TRUE(tab_contents_2);
   EXPECT_EQ(2, browser()->tab_count());
 
-  scoped_refptr<printing::PrintPreviewTabController>
-      tab_controller(new printing::PrintPreviewTabController());
+  printing::PrintPreviewTabController* tab_controller =
+      printing::PrintPreviewTabController::GetInstance();
   ASSERT_TRUE(tab_controller);
 
   // Create preview tab for |tab_contents_1|
@@ -153,8 +153,8 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_ClearInitiatorTabDetails) {
   TabContentsWrapper* initiator_tab =
       browser()->GetSelectedTabContentsWrapper();
 
-  scoped_refptr<printing::PrintPreviewTabController>
-      tab_controller(new printing::PrintPreviewTabController());
+  printing::PrintPreviewTabController* tab_controller =
+      printing::PrintPreviewTabController::GetInstance();
   ASSERT_TRUE(tab_controller);
 
   // Get the preview tab for initiator tab.
diff --git a/chrome/browser/ui/webui/print_preview_handler_unittest.cc b/chrome/browser/ui/webui/print_preview_handler_unittest.cc
index ace5504..2540876 100644
--- a/chrome/browser/ui/webui/print_preview_handler_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview_handler_unittest.cc
@@ -59,9 +59,9 @@ class PrintPreviewHandlerTest : public BrowserWithTestWindowTest {
         browser()->GetSelectedTabContentsWrapper();
     ASSERT_TRUE(initiator_tab);
 
-    scoped_refptr<printing::PrintPreviewTabController>
-        controller(new printing::PrintPreviewTabController());
-    ASSERT_TRUE(controller.get());
+    printing::PrintPreviewTabController* controller =
+        printing::PrintPreviewTabController::GetInstance();
+    ASSERT_TRUE(controller);
 
     preview_tab_ = controller->GetOrCreatePreviewTab(initiator_tab);
     ASSERT_TRUE(preview_tab_);
diff --git a/chrome/browser/ui/webui/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview_ui_unittest.cc
index 350e509..eac6b80 100644
--- a/chrome/browser/ui/webui/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview_ui_unittest.cc
@@ -50,8 +50,8 @@ TEST_F(PrintPreviewUIUnitTest, MAYBE_PrintPreviewData) {
   ASSERT_TRUE(initiator_tab);
   EXPECT_EQ(0U, GetConstrainedWindowCount(initiator_tab));
 
-  scoped_refptr<printing::PrintPreviewTabController>
-      controller(new printing::PrintPreviewTabController());
+  printing::PrintPreviewTabController* controller =
+      printing::PrintPreviewTabController::GetInstance();
   ASSERT_TRUE(controller);
 
   TabContentsWrapper* preview_tab =
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index 407b3dd..f005252 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/printing/background_printing_manager.h"
+#include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -197,7 +198,9 @@ printing::PrintJobManager* TestingBrowserProcess::print_job_manager() {
 
 printing::PrintPreviewTabController*
 TestingBrowserProcess::print_preview_tab_controller() {
-  return NULL;
+  if (!print_preview_tab_controller_.get())
+    print_preview_tab_controller_ = new printing::PrintPreviewTabController();
+  return print_preview_tab_controller_.get();
 }
 
 printing::BackgroundPrintingManager*
diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h
index 8de1fe5..d308651 100644
--- a/chrome/test/base/testing_browser_process.h
+++ b/chrome/test/base/testing_browser_process.h
@@ -121,7 +121,7 @@ class TestingBrowserProcess : public BrowserProcess {
   void SetGoogleURLTracker(GoogleURLTracker* google_url_tracker);
   void SetProfileManager(ProfileManager* profile_manager);
   void SetIOThread(IOThread* io_thread);
-  void SetDevToolsManager(DevToolsManager*);
+  void SetDevToolsManager(DevToolsManager* manager);
   void SetBrowserPolicyConnector(policy::BrowserPolicyConnector* connector);
 
  private:
@@ -137,6 +137,8 @@ class TestingBrowserProcess : public BrowserProcess {
   scoped_ptr<ProfileManager> profile_manager_;
   scoped_ptr<NotificationUIManager> notification_ui_manager_;
   scoped_ptr<printing::BackgroundPrintingManager> background_printing_manager_;
+  scoped_refptr<printing::PrintPreviewTabController>
+      print_preview_tab_controller_;
   scoped_ptr<prerender::PrerenderTracker> prerender_tracker_;
   IOThread* io_thread_;
   scoped_ptr<DevToolsManager> devtools_manager_;