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

Unified Diff: components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc

Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad headers Created 5 years 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
Index: components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc
diff --git a/components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc b/components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc
index 1482166b6e50a604505fbc52314de1c566f820b2..15fe26d929db5c24a0c32b37d4c6767747ee18a7 100644
--- a/components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc
+++ b/components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc
@@ -4,6 +4,8 @@
#include "components/page_load_metrics/renderer/metrics_render_frame_observer.h"
+#include <utility>
+
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "base/timer/mock_timer.h"
@@ -46,7 +48,7 @@ class MockMetricsRenderFrameObserver : public MetricsRenderFrameObserver {
scoped_ptr<base::Timer> CreateTimer() const override {
if (!mock_timer_)
ADD_FAILURE() << "CreateTimer() called, but no MockTimer available.";
- return mock_timer_.Pass();
+ return std::move(mock_timer_);
}
// We intercept sent messages and dispatch them to a MockIPCInterceptor, which
@@ -59,7 +61,7 @@ class MockMetricsRenderFrameObserver : public MetricsRenderFrameObserver {
void set_mock_timer(scoped_ptr<base::Timer> timer) {
ASSERT_EQ(nullptr, mock_timer_);
- mock_timer_ = timer.Pass();
+ mock_timer_ = std::move(timer);
}
MOCK_CONST_METHOD0(GetTiming, PageLoadTiming());

Powered by Google App Engine
This is Rietveld 408576698