| Index: chrome/browser/ui/webui/print_preview_ui_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/print_preview_ui_unittest.cc (revision 99027)
|
| +++ chrome/browser/ui/webui/print_preview_ui_unittest.cc (working copy)
|
| @@ -37,8 +37,8 @@
|
| browser()->GetSelectedTabContentsWrapper();
|
| ASSERT_TRUE(initiator_tab);
|
|
|
| - scoped_refptr<printing::PrintPreviewTabController>
|
| - controller(new printing::PrintPreviewTabController());
|
| + printing::PrintPreviewTabController* controller =
|
| + printing::PrintPreviewTabController::GetInstance();
|
| ASSERT_TRUE(controller);
|
|
|
| TabContentsWrapper* preview_tab =
|
| @@ -48,8 +48,8 @@
|
| EXPECT_EQ(2, browser()->tab_count());
|
|
|
| PrintPreviewUI* preview_ui =
|
| - reinterpret_cast<PrintPreviewUI*>(preview_tab->web_ui());
|
| - ASSERT_TRUE(preview_ui != NULL);
|
| + static_cast<PrintPreviewUI*>(preview_tab->web_ui());
|
| + ASSERT_TRUE(preview_ui);
|
|
|
| scoped_refptr<RefCountedBytes> data;
|
| preview_ui->GetPrintPreviewDataForIndex(
|
| @@ -97,8 +97,8 @@
|
| browser()->GetSelectedTabContentsWrapper();
|
| ASSERT_TRUE(initiator_tab);
|
|
|
| - scoped_refptr<printing::PrintPreviewTabController>
|
| - controller(new printing::PrintPreviewTabController());
|
| + printing::PrintPreviewTabController* controller =
|
| + printing::PrintPreviewTabController::GetInstance();
|
| ASSERT_TRUE(controller);
|
|
|
| TabContentsWrapper* preview_tab =
|
| @@ -108,8 +108,8 @@
|
| EXPECT_EQ(2, browser()->tab_count());
|
|
|
| PrintPreviewUI* preview_ui =
|
| - reinterpret_cast<PrintPreviewUI*>(preview_tab->web_ui());
|
| - ASSERT_TRUE(preview_ui != NULL);
|
| + static_cast<PrintPreviewUI*>(preview_tab->web_ui());
|
| + ASSERT_TRUE(preview_ui);
|
|
|
| scoped_refptr<RefCountedBytes> data;
|
| preview_ui->GetPrintPreviewDataForIndex(printing::FIRST_PAGE_INDEX, &data);
|
| @@ -164,8 +164,8 @@
|
| browser()->GetSelectedTabContentsWrapper();
|
| ASSERT_TRUE(initiator_tab);
|
|
|
| - scoped_refptr<printing::PrintPreviewTabController>
|
| - controller(new printing::PrintPreviewTabController());
|
| + printing::PrintPreviewTabController* controller =
|
| + printing::PrintPreviewTabController::GetInstance();
|
| ASSERT_TRUE(controller);
|
|
|
| TabContentsWrapper* preview_tab =
|
| @@ -175,8 +175,8 @@
|
| EXPECT_EQ(2, browser()->tab_count());
|
|
|
| PrintPreviewUI* preview_ui =
|
| - reinterpret_cast<PrintPreviewUI*>(preview_tab->web_ui());
|
| - ASSERT_TRUE(preview_ui != NULL);
|
| + static_cast<PrintPreviewUI*>(preview_tab->web_ui());
|
| + ASSERT_TRUE(preview_ui);
|
|
|
| // Test with invalid |preview_ui_addr|.
|
| bool cancel = false;
|
|
|