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

Unified Diff: remoting/test/app_remoting_latency_test_fixture.h

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 months 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
« no previous file with comments | « remoting/test/app_remoting_connection_helper.cc ('k') | remoting/test/app_remoting_latency_test_fixture.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/test/app_remoting_latency_test_fixture.h
diff --git a/remoting/test/app_remoting_latency_test_fixture.h b/remoting/test/app_remoting_latency_test_fixture.h
index f13c2937fefb9d8cb32a5fcdcba67d971c54d692..cc42a8e0eb73fa5b85a4677d2bf2e31792e58d40 100644
--- a/remoting/test/app_remoting_latency_test_fixture.h
+++ b/remoting/test/app_remoting_latency_test_fixture.h
@@ -5,11 +5,11 @@
#ifndef REMOTING_TEST_APP_REMOTING_LATENCY_TEST_FIXTURE_H_
#define REMOTING_TEST_APP_REMOTING_LATENCY_TEST_FIXTURE_H_
+#include <memory>
#include <vector>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "remoting/test/remote_connection_observer.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -89,7 +89,7 @@ class AppRemotingLatencyTestFixture : public testing::Test,
virtual void ResetApplicationState();
// Creates and manages the connection to the remote host.
- scoped_ptr<AppRemotingConnectionHelper> connection_helper_;
+ std::unique_ptr<AppRemotingConnectionHelper> connection_helper_;
private:
// testing::Test interface.
@@ -106,14 +106,14 @@ class AppRemotingLatencyTestFixture : public testing::Test,
// true if we received a response within the maximum time limit.
// NOTE: This method should only be run when as a returned callback by
// SetExpectedImagePattern.
- bool WaitForImagePatternMatch(scoped_ptr<base::RunLoop> run_loop,
+ bool WaitForImagePatternMatch(std::unique_ptr<base::RunLoop> run_loop,
const base::TimeDelta& max_wait_time);
// Used to run the thread's message loop.
- scoped_ptr<base::RunLoop> run_loop_;
+ std::unique_ptr<base::RunLoop> run_loop_;
// Used for setting timeouts and delays.
- scoped_ptr<base::Timer> timer_;
+ std::unique_ptr<base::Timer> timer_;
// Used to maintain a reference to the TestVideoRenderer instance while it
// exists.
« no previous file with comments | « remoting/test/app_remoting_connection_helper.cc ('k') | remoting/test/app_remoting_latency_test_fixture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698