diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-17 12:30:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-17 11:33:03 +0000 |
| commit | f0775ea93ab66f0676993db1633c9098dfb3a3ad (patch) | |
| tree | f61290cdf2e18901983450c329fa9eac8dc30f60 | |
| parent | 17e4aafb6fe894047b46abeb3c3b8290de4094cf (diff) | |
| download | qtwebengine-chromium-f0775ea93ab66f0676993db1633c9098dfb3a3ad.tar.gz | |
Fix building with enable_reporting=false
The feature is default on at run-time and we don't use it.
Change-Id: Ie08fbe52f92165c2361abc882b2cd60cf3bd38eb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | chromium/content/browser/BUILD.gn | 10 | ||||
| -rw-r--r-- | chromium/content/browser/renderer_host/render_process_host_impl.cc | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn index d9cd9ca0a40..e4c1d0c6507 100644 --- a/chromium/content/browser/BUILD.gn +++ b/chromium/content/browser/BUILD.gn @@ -7,6 +7,7 @@ import("//build/config/features.gni") import("//build/config/ui.gni") import("//gpu/vulkan/features.gni") import("//media/media_options.gni") +import("//net/features.gni") import("//ppapi/features/features.gni") import("//printing/features/features.gni") import("//third_party/WebKit/public/public_features.gni") @@ -1060,8 +1061,6 @@ source_set("browser") { "net/network_quality_observer_impl.h", "net/quota_policy_cookie_store.cc", "net/quota_policy_cookie_store.h", - "net/reporting_service_proxy.cc", - "net/reporting_service_proxy.h", "net/view_blob_internals_job_factory.cc", "net/view_blob_internals_job_factory.h", "net/view_http_cache_job_factory.cc", @@ -1616,6 +1615,13 @@ source_set("browser") { deps += [ "//printing" ] } + if (enable_reporting) { + sources += [ + "net/reporting_service_proxy.cc", + "net/reporting_service_proxy.h", + ] + } + if (!is_mac) { deps += [ "//sandbox" ] } diff --git a/chromium/content/browser/renderer_host/render_process_host_impl.cc b/chromium/content/browser/renderer_host/render_process_host_impl.cc index ca29df732ec..5dc7ac4309b 100644 --- a/chromium/content/browser/renderer_host/render_process_host_impl.cc +++ b/chromium/content/browser/renderer_host/render_process_host_impl.cc @@ -1930,8 +1930,10 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { resource_message_filter_, service_worker_context)); } +#if BUILDFLAG(ENABLE_REPORTING) registry->AddInterface( base::Bind(&CreateReportingServiceProxy, storage_partition_impl_)); +#endif // This is to support usage of WebSockets in cases in which there is no // associated RenderFrame (e.g., Shared Workers). |