Chromium Code Reviews| Index: chrome/browser/printing/print_preview_tab_controller_unittest.cc |
| diff --git a/chrome/browser/printing/print_preview_tab_controller_unittest.cc b/chrome/browser/printing/print_preview_tab_controller_unittest.cc |
| index e16e46bb9e6808c641a8a956b30b4746451e2447..7113bd53e5a1a4e37bb3ae9acc254628732c51f5 100644 |
| --- a/chrome/browser/printing/print_preview_tab_controller_unittest.cc |
| +++ b/chrome/browser/printing/print_preview_tab_controller_unittest.cc |
| @@ -16,7 +16,9 @@ |
| #include "content/public/browser/navigation_details.h" |
| #include "content/public/browser/notification_service.h" |
| #include "content/public/browser/notification_types.h" |
| +#include "content/public/browser/plugin_service.h" |
| #include "content/public/common/url_constants.h" |
| +#include "webkit/plugins/npapi/mock_plugin_list.h" |
| // Test crashes on Aura due to initiator tab's native view having no parent. |
| // http://crbug.com/104284 |
| @@ -39,8 +41,16 @@ class PrintPreviewTabControllerUnitTest : public BrowserWithTestWindowTest { |
| 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); |
| } |
| + |
| + private: |
| + webkit::npapi::MockPluginList plugin_list_; |
|
Peter Kasting
2012/11/15 18:53:50
Nit: DISALLOW_COPY_AND_ASSIGN too
Bernhard Bauer
2012/11/15 23:26:30
Gahh, I always forget these. Note to self: write a
|
| }; |
| // Create/Get a preview tab for initiator tab. |