| Index: chrome/renderer/chrome_render_process_observer.cc
|
| diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
|
| index 018cd6303a04dfbea767b05f399f5b38b4b41b44..37452b12cd8f3b41a2a9bc9919453064edc43e21 100644
|
| --- a/chrome/renderer/chrome_render_process_observer.cc
|
| +++ b/chrome/renderer/chrome_render_process_observer.cc
|
| @@ -5,8 +5,8 @@
|
| #include "chrome/renderer/chrome_render_process_observer.h"
|
|
|
| #include <stddef.h>
|
| -
|
| #include <limits>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| @@ -124,10 +124,11 @@ static const int kWaitForWorkersStatsTimeoutMS = 20;
|
|
|
| class ResourceUsageReporterImpl : public ResourceUsageReporter {
|
| public:
|
| - ResourceUsageReporterImpl(
|
| - base::WeakPtr<ChromeRenderProcessObserver> observer,
|
| - mojo::InterfaceRequest<ResourceUsageReporter> req)
|
| - : binding_(this, req.Pass()), observer_(observer), weak_factory_(this) {}
|
| + ResourceUsageReporterImpl(base::WeakPtr<ChromeRenderProcessObserver> observer,
|
| + mojo::InterfaceRequest<ResourceUsageReporter> req)
|
| + : binding_(this, std::move(req)),
|
| + observer_(observer),
|
| + weak_factory_(this) {}
|
| ~ResourceUsageReporterImpl() override {}
|
|
|
| private:
|
| @@ -158,7 +159,7 @@ class ResourceUsageReporterImpl : public ResourceUsageReporter {
|
|
|
| void SendResults() {
|
| if (!callback_.is_null())
|
| - callback_.Run(usage_data_.Pass());
|
| + callback_.Run(std::move(usage_data_));
|
| callback_.reset();
|
| weak_factory_.InvalidateWeakPtrs();
|
| workers_to_go_ = 0;
|
| @@ -220,7 +221,7 @@ class ResourceUsageReporterImpl : public ResourceUsageReporter {
|
| void CreateResourceUsageReporter(
|
| base::WeakPtr<ChromeRenderProcessObserver> observer,
|
| mojo::InterfaceRequest<ResourceUsageReporter> request) {
|
| - new ResourceUsageReporterImpl(observer, request.Pass());
|
| + new ResourceUsageReporterImpl(observer, std::move(request));
|
| }
|
|
|
| } // namespace
|
|
|