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

Unified Diff: chrome/test/base/testing_browser_process.cc

Issue 2458833005: Move printing defines to buildflag system. (Closed)
Patch Set: Merge Created 4 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
« no previous file with comments | « chrome/test/base/testing_browser_process.h ('k') | chrome/test/base/web_ui_browser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_browser_process.cc
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index b0e3ca7daa70f683a51ef885ca4da9392a0cffa5..84aa188621518dec978dce952554e520d7ab3b30 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -25,6 +25,7 @@
#include "components/subresource_filter/core/browser/ruleset_service.h"
#include "content/public/browser/notification_service.h"
#include "net/url_request/url_request_context_getter.h"
+#include "printing/features/features.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/message_center/message_center.h"
@@ -40,7 +41,7 @@
#include "components/storage_monitor/test_storage_monitor.h"
#endif
-#if defined(ENABLE_PRINT_PREVIEW)
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
#include "chrome/browser/printing/background_printing_manager.h"
#include "chrome/browser/printing/print_preview_dialog_controller.h"
#endif
@@ -254,7 +255,7 @@ bool TestingBrowserProcess::IsShuttingDown() {
}
printing::PrintJobManager* TestingBrowserProcess::print_job_manager() {
-#if defined(ENABLE_PRINTING)
+#if BUILDFLAG(ENABLE_PRINTING)
if (!print_job_manager_.get())
print_job_manager_.reset(new printing::PrintJobManager());
return print_job_manager_.get();
@@ -266,7 +267,7 @@ printing::PrintJobManager* TestingBrowserProcess::print_job_manager() {
printing::PrintPreviewDialogController*
TestingBrowserProcess::print_preview_dialog_controller() {
-#if defined(ENABLE_PRINT_PREVIEW)
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
if (!print_preview_dialog_controller_.get())
print_preview_dialog_controller_ =
new printing::PrintPreviewDialogController();
@@ -279,7 +280,7 @@ TestingBrowserProcess::print_preview_dialog_controller() {
printing::BackgroundPrintingManager*
TestingBrowserProcess::background_printing_manager() {
-#if defined(ENABLE_PRINT_PREVIEW)
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
if (!background_printing_manager_.get()) {
background_printing_manager_.reset(
new printing::BackgroundPrintingManager());
« no previous file with comments | « chrome/test/base/testing_browser_process.h ('k') | chrome/test/base/web_ui_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698