| Index: chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
|
| diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
|
| index 562ea47f107b59276f65da7af474cfdac04c62be..456a16852d213764493fbefbebcf9b57b100501e 100644
|
| --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
|
| +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/memory/ref_counted_memory.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/printing/print_preview_tab_controller.h"
|
| +#include "chrome/browser/printing/print_preview_test.h"
|
| #include "chrome/browser/printing/print_view_manager.h"
|
| #include "chrome/browser/ui/browser_commands.h"
|
| #include "chrome/browser/ui/browser_tabstrip.h"
|
| @@ -15,10 +16,12 @@
|
| #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/test/base/browser_with_test_window_test.h"
|
| +#include "content/public/browser/plugin_service.h"
|
| #include "content/public/browser/site_instance.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/test/web_contents_tester.h"
|
| #include "printing/print_job_constants.h"
|
| +#include "webkit/plugins/npapi/mock_plugin_list.h"
|
|
|
| using content::WebContents;
|
| using content::WebContentsTester;
|
| @@ -40,21 +43,26 @@ size_t GetConstrainedWindowCount(TabContents* tab) {
|
|
|
| } // namespace
|
|
|
| -class PrintPreviewUIUnitTest : public BrowserWithTestWindowTest {
|
| +class PrintPreviewUIUnitTest : public PrintPreviewTest {
|
| public:
|
| - PrintPreviewUIUnitTest() {}
|
| - virtual ~PrintPreviewUIUnitTest() {}
|
| + PrintPreviewUIUnitTest();
|
| + virtual ~PrintPreviewUIUnitTest();
|
|
|
| protected:
|
| - virtual void SetUp() OVERRIDE {
|
| - BrowserWithTestWindowTest::SetUp();
|
| + virtual void SetUp() OVERRIDE;
|
|
|
| - profile()->GetPrefs()->SetBoolean(prefs::kPrintPreviewDisabled, false);
|
| -
|
| - chrome::NewTab(browser());
|
| - }
|
| + DISALLOW_COPY_AND_ASSIGN(PrintPreviewUIUnitTest);
|
| };
|
|
|
| +PrintPreviewUIUnitTest::PrintPreviewUIUnitTest() {}
|
| +PrintPreviewUIUnitTest::~PrintPreviewUIUnitTest() {}
|
| +
|
| +void PrintPreviewUIUnitTest::SetUp() {
|
| + PrintPreviewTest::SetUp();
|
| +
|
| + chrome::NewTab(browser());
|
| +}
|
| +
|
| // Create/Get a preview tab for initiator tab.
|
| TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) {
|
| TabContents* initiator_tab = chrome::GetActiveTabContents(browser());
|
|
|