Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2932)

Unified Diff: chrome/browser/ui/webui/print_preview_data_source_unittest.cc

Issue 7063030: PrintPreview: Print Preview is not staying associated with initiator renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix win compile error Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/print_preview_data_source_unittest.cc
diff --git a/chrome/browser/ui/webui/print_preview_ui_html_source_unittest.cc b/chrome/browser/ui/webui/print_preview_data_source_unittest.cc
similarity index 75%
rename from chrome/browser/ui/webui/print_preview_ui_html_source_unittest.cc
rename to chrome/browser/ui/webui/print_preview_data_source_unittest.cc
index 5653bc26497ebc2d4cd6ba74f2cbf63a169b9994..b55bff26ec60d1cfa68ce3293cc87b21ae1d598f 100644
--- a/chrome/browser/ui/webui/print_preview_ui_html_source_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview_data_source_unittest.cc
@@ -7,16 +7,16 @@
#include "chrome/browser/printing/print_preview_tab_controller.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/webui/print_preview_ui.h"
-#include "chrome/browser/ui/webui/print_preview_ui_html_source.h"
+#include "chrome/browser/ui/webui/print_preview_data_source.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/browser_with_test_window_test.h"
#include "chrome/test/testing_profile.h"
#include "content/browser/tab_contents/tab_contents.h"
-typedef BrowserWithTestWindowTest PrintPreviewUIHTMLSourceTest;
+typedef BrowserWithTestWindowTest PrintPreviewDataSourceTest;
// Create/Get a preview tab for initiator tab.
-TEST_F(PrintPreviewUIHTMLSourceTest, PrintPreviewData) {
+TEST_F(PrintPreviewDataSourceTest, PrintPreviewData) {
#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)
CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePrintPreview);
#endif
@@ -40,21 +40,20 @@ TEST_F(PrintPreviewUIHTMLSourceTest, PrintPreviewData) {
PrintPreviewUI* preview_ui =
reinterpret_cast<PrintPreviewUI*>(preview_tab->web_ui());
ASSERT_TRUE(preview_ui != NULL);
- PrintPreviewUIHTMLSource* html_source = preview_ui->html_source();
- PrintPreviewUIHTMLSource::PrintPreviewData data;
- html_source->GetPrintPreviewData(&data);
+ PrintPreviewDataSource::PrintPreviewData data;
+ preview_ui->GetPrintPreviewData(&data);
EXPECT_EQ(NULL, data.first);
EXPECT_EQ(0U, data.second);
- PrintPreviewUIHTMLSource::PrintPreviewData dummy_data =
+ PrintPreviewDataSource::PrintPreviewData dummy_data =
std::make_pair(new base::SharedMemory(), 1234);
- html_source->SetPrintPreviewData(dummy_data);
- html_source->GetPrintPreviewData(&data);
+ preview_ui->SetPrintPreviewData(dummy_data);
+ preview_ui->GetPrintPreviewData(&data);
EXPECT_EQ(dummy_data, data);
// This should not cause any memory leaks.
dummy_data.first = new base::SharedMemory();
- html_source->SetPrintPreviewData(dummy_data);
+ preview_ui->SetPrintPreviewData(dummy_data);
}

Powered by Google App Engine
This is Rietveld 408576698