Index: remoting/test/chromoting_test_fixture.h |
diff --git a/remoting/test/chromoting_test_fixture.h b/remoting/test/chromoting_test_fixture.h |
index c6a9fc58beedd066eb74a459b14209b450d39b9a..5293815d6954728bd1166e611257bfcdcd828251 100644 |
--- a/remoting/test/chromoting_test_fixture.h |
+++ b/remoting/test/chromoting_test_fixture.h |
@@ -5,8 +5,9 @@ |
#ifndef REMOTING_TEST_CHROMOTING_TEST_FIXTURE_H_ |
#define REMOTING_TEST_CHROMOTING_TEST_FIXTURE_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/threading/thread_checker.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -40,7 +41,7 @@ class ChromotingTestFixture |
protected: |
// Observes and saves the times when a chromoting client changes its state. |
- scoped_ptr<ConnectionTimeObserver> connection_time_observer_; |
+ std::unique_ptr<ConnectionTimeObserver> connection_time_observer_; |
private: |
// testing::Test overrides. |
@@ -53,7 +54,7 @@ class ChromotingTestFixture |
void DestroyObserver(); |
// Creates and manages the connection to the remote host. |
- scoped_ptr<TestChromotingClient> test_chromoting_client_; |
+ std::unique_ptr<TestChromotingClient> test_chromoting_client_; |
base::ThreadChecker thread_checker_; |