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

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc

Issue 10808006: Move printing.* prefs from local state to profile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Retired PrintPreviewUnitTestBase class. Created 8 years, 5 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/print_preview_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
index 07938e2928cb09512d7f4f1d8c5e4fd16ecc80f7..1432760fa62b8861d64391e6e9a4454c2df91166 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
@@ -5,9 +5,9 @@
#include "base/json/json_writer.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/printing/background_printing_manager.h"
#include "chrome/browser/printing/print_preview_tab_controller.h"
-#include "chrome/browser/printing/print_preview_unit_test_base.h"
#include "chrome/browser/printing/print_view_manager.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_tabstrip.h"
@@ -15,6 +15,8 @@
#include "chrome/browser/ui/webui/print_preview/print_preview_handler.h"
#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
#include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/test/base/browser_with_test_window_test.h"
#include "content/public/browser/web_contents.h"
#include "printing/page_size_margins.h"
#include "printing/print_job_constants.h"
@@ -34,7 +36,7 @@ DictionaryValue* GetCustomMarginsDictionary(
} // namespace
-class PrintPreviewHandlerTest : public PrintPreviewUnitTestBase {
+class PrintPreviewHandlerTest : public BrowserWithTestWindowTest {
public:
PrintPreviewHandlerTest() :
preview_ui_(NULL),
@@ -44,7 +46,9 @@ class PrintPreviewHandlerTest : public PrintPreviewUnitTestBase {
protected:
virtual void SetUp() OVERRIDE {
- PrintPreviewUnitTestBase::SetUp();
+ BrowserWithTestWindowTest::SetUp();
+
+ profile()->GetPrefs()->SetBoolean(prefs::kPrintPreviewDisabled, false);
chrome::NewTab(browser());
EXPECT_EQ(1, browser()->tab_count());
@@ -55,7 +59,7 @@ class PrintPreviewHandlerTest : public PrintPreviewUnitTestBase {
DeletePrintPreviewTab();
ClearStickySettings();
- PrintPreviewUnitTestBase::TearDown();
+ BrowserWithTestWindowTest::TearDown();
}
void OpenPrintPreviewTab() {

Powered by Google App Engine
This is Rietveld 408576698