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

Side by Side Diff: chrome/browser/printing/print_preview_test.cc

Issue 19706002: Remove plugin_list.h includes from chrome tests in preparation for moving webkit/plugins to content… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix posix tests Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/printing/print_preview_test.h" 5 #include "chrome/browser/printing/print_preview_test.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_iterator.h" 9 #include "chrome/browser/ui/browser_iterator.h"
10 #include "chrome/browser/ui/tabs/tab_strip_model.h" 10 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 } // namespace 69 } // namespace
70 70
71 PrintPreviewTest::PrintPreviewTest() {} 71 PrintPreviewTest::PrintPreviewTest() {}
72 PrintPreviewTest::~PrintPreviewTest() {} 72 PrintPreviewTest::~PrintPreviewTest() {}
73 73
74 void PrintPreviewTest::SetUp() { 74 void PrintPreviewTest::SetUp() {
75 BrowserWithTestWindowTest::SetUp(); 75 BrowserWithTestWindowTest::SetUp();
76 76
77 // The PluginService will be destroyed at the end of the test (due to the 77 // The PluginService will be destroyed at the end of the test (due to the
78 // ShadowingAtExitManager in our base class). 78 // ShadowingAtExitManager in our base class).
79 content::PluginService::GetInstance()->SetPluginListForTesting( 79 content::PluginService::GetInstance()->Init();
80 &plugin_list_); 80 content::PluginService::GetInstance()->DisablePluginsDiscoveryForTesting();
81 81
82 profile()->GetPrefs()->SetBoolean(prefs::kPrintPreviewDisabled, false); 82 profile()->GetPrefs()->SetBoolean(prefs::kPrintPreviewDisabled, false);
83 } 83 }
84 84
85 BrowserWindow* PrintPreviewTest::CreateBrowserWindow() { 85 BrowserWindow* PrintPreviewTest::CreateBrowserWindow() {
86 return new PrintPreviewTestBrowserWindow; 86 return new PrintPreviewTestBrowserWindow;
87 } 87 }
OLDNEW
« no previous file with comments | « chrome/browser/printing/print_preview_test.h ('k') | chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698