diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-17 12:30:46 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2018-01-22 09:52:17 +0000 |
| commit | 668a1a819743efce398194803b00f9fbb103a5a7 (patch) | |
| tree | 44e041ae6fdd9181234f4fc1ab16a760b5ac516b | |
| parent | 8311adf4675e12a8306e2f0b94d822df7e192660 (diff) | |
| download | qtwebengine-chromium-668a1a819743efce398194803b00f9fbb103a5a7.tar.gz | |
Fix building with enable_reporting=false
The feature is default on at run-time and we don't use it.
Cherry picked from 61-based: f0775ea93ab66f0676993db1633c9098dfb3a3ad
Change-Id: I6c89f82e9ce4570a1ed28e4e5ba5cfefb99a114f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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 8b5b0277c6f..8e17f405de4 100644 --- a/chromium/content/browser/BUILD.gn +++ b/chromium/content/browser/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/linux/pangocairo/pangocairo.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") @@ -1112,8 +1113,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", @@ -1698,6 +1697,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 26a4e003b1d..54f98fa1a86 100644 --- a/chromium/content/browser/renderer_host/render_process_host_impl.cc +++ b/chromium/content/browser/renderer_host/render_process_host_impl.cc @@ -1917,8 +1917,10 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { registry->AddInterface( base::Bind(&metrics::CreateSingleSampleMetricsProvider)); +#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). |