| Index: net/android/network_change_notifier_android_unittest.cc
|
| diff --git a/net/android/network_change_notifier_android_unittest.cc b/net/android/network_change_notifier_android_unittest.cc
|
| index e07a89eaf1438c862190ad10187a31a4a0d3b8db..6d71470654725ad755ba0449a4127ee4887b0f6d 100644
|
| --- a/net/android/network_change_notifier_android_unittest.cc
|
| +++ b/net/android/network_change_notifier_android_unittest.cc
|
| @@ -274,7 +274,7 @@ TEST_F(BaseNetworkChangeNotifierAndroidTest,
|
| delegate_.GetCurrentConnectionType());
|
| // Instantiate another delegate to validate that it uses the actual
|
| // connection type at construction.
|
| - scoped_ptr<NetworkChangeNotifierDelegateAndroid> other_delegate(
|
| + std::unique_ptr<NetworkChangeNotifierDelegateAndroid> other_delegate(
|
| new NetworkChangeNotifierDelegateAndroid());
|
| EXPECT_EQ(NetworkChangeNotifier::CONNECTION_NONE,
|
| other_delegate->GetCurrentConnectionType());
|
| @@ -314,7 +314,7 @@ class NetworkChangeNotifierAndroidTest
|
| NetworkChangeNotifierObserver other_connection_type_observer_;
|
| NetworkChangeNotifier::DisableForTest disable_for_test_;
|
| DnsConfig dns_config_;
|
| - scoped_ptr<NetworkChangeNotifierAndroid> notifier_;
|
| + std::unique_ptr<NetworkChangeNotifierAndroid> notifier_;
|
| };
|
|
|
| class NetworkChangeNotifierDelegateAndroidTest
|
|
|