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

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

Issue 11312223: Revert 167487 - Get full WebPluginInfo for the PDF plug-in before enabling it for print preview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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_ui_unittest.cc
===================================================================
--- chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc (revision 167523)
+++ chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc (working copy)
@@ -15,12 +15,10 @@
#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;
@@ -51,18 +49,10 @@
virtual void SetUp() OVERRIDE {
BrowserWithTestWindowTest::SetUp();
- // The PluginService will be destroyed at the end of the test (due to the
- // ShadowingAtExitManager in our base class).
- content::PluginService::GetInstance()->SetPluginListForTesting(
- &plugin_list_);
-
profile()->GetPrefs()->SetBoolean(prefs::kPrintPreviewDisabled, false);
chrome::NewTab(browser());
}
-
- private:
- webkit::npapi::MockPluginList plugin_list_;
};
// Create/Get a preview tab for initiator tab.
« no previous file with comments | « chrome/browser/printing/print_preview_tab_controller_unittest.cc ('k') | chrome/test/base/browser_with_test_window_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698