Index: chrome/browser/printing/print_preview_unit_test_base.cc |
diff --git a/chrome/browser/printing/print_preview_unit_test_base.cc b/chrome/browser/printing/print_preview_unit_test_base.cc |
index 0fb0e33b44ee93eeedbf1fcb1e1e6fd545e263ae..6a005d41a8ede5201faf4f8eae4f689172540dc5 100644 |
--- a/chrome/browser/printing/print_preview_unit_test_base.cc |
+++ b/chrome/browser/printing/print_preview_unit_test_base.cc |
@@ -4,10 +4,8 @@ |
#include "chrome/browser/printing/print_preview_unit_test_base.h" |
-#include "chrome/browser/prefs/browser_prefs.h" |
+#include "chrome/browser/prefs/pref_service.h" |
#include "chrome/common/pref_names.h" |
-#include "chrome/test/base/testing_browser_process.h" |
-#include "chrome/test/base/testing_pref_service.h" |
PrintPreviewUnitTestBase::PrintPreviewUnitTestBase() { |
} |
@@ -18,21 +16,5 @@ PrintPreviewUnitTestBase::~PrintPreviewUnitTestBase() { |
void PrintPreviewUnitTestBase::SetUp() { |
BrowserWithTestWindowTest::SetUp(); |
- testing_local_state_.reset(new TestingPrefService); |
- testing_local_state_->SetUserPref(prefs::kPrintPreviewDisabled, |
- Value::CreateBooleanValue(false)); |
- |
- chrome::RegisterLocalState(testing_local_state_.get()); |
- TestingBrowserProcess* testing_browser_process = |
- static_cast<TestingBrowserProcess*>(g_browser_process); |
- EXPECT_FALSE(testing_browser_process->local_state()); |
- testing_browser_process->SetLocalState(testing_local_state_.get()); |
-} |
- |
-void PrintPreviewUnitTestBase::TearDown() { |
- EXPECT_EQ(testing_local_state_.get(), g_browser_process->local_state()); |
- TestingBrowserProcess* testing_browser_process = |
- static_cast<TestingBrowserProcess*>(g_browser_process); |
- testing_browser_process->SetLocalState(NULL); |
- BrowserWithTestWindowTest::TearDown(); |
+ profile()->GetPrefs()->SetBoolean(prefs::kPrintPreviewDisabled, false); |
Mattias Nissler (ping if slow)
2012/07/18 10:11:53
Not sure whether it's still a good idea to keep th
bartfab (slow)
2012/07/18 14:01:24
I retired the class. Done.
|
} |