Chromium Code Reviews| Index: chrome/utility/chrome_content_utility_client.cc |
| diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc |
| index 1c79cdf4e55c426c0faf53aad0c6919618e1a411..38bbfdab28aaa3e026c2247346ac5e8c89b03ac1 100644 |
| --- a/chrome/utility/chrome_content_utility_client.cc |
| +++ b/chrome/utility/chrome_content_utility_client.cc |
| @@ -29,7 +29,10 @@ |
| #if !defined(OS_ANDROID) |
| #include "chrome/utility/profile_import_handler.h" |
| +#include "content/public/common/resource_usage_reporter.mojom.h" |
| #include "net/proxy/mojo_proxy_resolver_factory_impl.h" |
| +#include "net/proxy/proxy_resolver_v8.h" |
| +#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" |
| #endif |
| #if defined(OS_ANDROID) && defined(USE_SECCOMP_BPF) |
| @@ -87,6 +90,34 @@ void CreateProxyResolverFactory( |
| // will be destroyed. |
| new net::MojoProxyResolverFactoryImpl(request.Pass()); |
| } |
| + |
| +class ResourceUsageReporterImpl : public content::ResourceUsageReporter { |
| + public: |
| + ResourceUsageReporterImpl( |
|
ncarter (slow)
2015/05/01 21:16:52
explicit
Anand Mistry (off Chromium)
2015/05/06 02:44:18
Done.
|
| + mojo::InterfaceRequest<content::ResourceUsageReporter> req) |
| + : binding_(this, req.Pass()) {} |
| + ~ResourceUsageReporterImpl() override {} |
| + |
| + private: |
| + void GetUsageData(const mojo::Callback<void(content::ResourceUsageDataPtr)>& |
| + callback) override { |
| + content::ResourceUsageDataPtr data = content::ResourceUsageData::New(); |
| + size_t total_heap_size = net::ProxyResolverV8::GetTotalHeapSize(); |
| + if (total_heap_size) { |
| + data->reports_v8_stats = true; |
| + data->v8_memory_allocated = total_heap_size; |
| + data->v8_memory_used = net::ProxyResolverV8::GetUsedHeapSize(); |
| + } |
| + callback.Run(data.Pass()); |
| + } |
| + |
| + mojo::StrongBinding<content::ResourceUsageReporter> binding_; |
| +}; |
| + |
| +void CreateResourceUsageReporter( |
| + mojo::InterfaceRequest<content::ResourceUsageReporter> request) { |
| + new ResourceUsageReporterImpl(request.Pass()); |
| +} |
| #endif // OS_ANDROID |
| } // namespace |
| @@ -187,6 +218,8 @@ void ChromeContentUtilityClient::RegisterMojoServices( |
| #if !defined(OS_ANDROID) |
| registry->AddService<net::interfaces::ProxyResolverFactory>( |
| base::Bind(CreateProxyResolverFactory)); |
| + registry->AddService<content::ResourceUsageReporter>( |
| + base::Bind(CreateResourceUsageReporter)); |
| #endif |
| } |