Change scoped_ptr to std::unique_ptr in //net.

net/android/network_change_notifier_android_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // See network_change_notifier_android.h for design explanations.
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 256 matching lines @@
 // and relying on the first network change notification to set it correctly can
 // be problematic in case there is a long delay between the delegate's
 // construction and the notification.
 TEST_F(BaseNetworkChangeNotifierAndroidTest,
        DelegateIsInitializedWithCurrentConnectionType) {
   SetOffline();
   ASSERT_EQ(NetworkChangeNotifier::CONNECTION_NONE,
             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());
 
   // Toggle the global connectivity state and instantiate another delegate
   // again.
   SetOnline();
   ASSERT_EQ(NetworkChangeNotifier::CONNECTION_UNKNOWN,
             delegate_.GetCurrentConnectionType());
   other_delegate.reset(new NetworkChangeNotifierDelegateAndroid());
@@ skipping 19 matching lines @@
 
   void ForceNetworkHandlesSupportedForTesting() {
     notifier_->ForceNetworkHandlesSupportedForTesting();
   }
 
   NetworkChangeNotifierObserver connection_type_observer_;
   NetworkChangeNotifierMaxBandwidthObserver max_bandwidth_observer_;
   NetworkChangeNotifierObserver other_connection_type_observer_;
   NetworkChangeNotifier::DisableForTest disable_for_test_;
   DnsConfig dns_config_;
-  scoped_ptr<NetworkChangeNotifierAndroid> notifier_;
+  std::unique_ptr<NetworkChangeNotifierAndroid> notifier_;
 };
 
 class NetworkChangeNotifierDelegateAndroidTest
     : public NetworkChangeNotifierAndroidTest {
  protected:
   NetworkChangeNotifierDelegateAndroidTest() {
     delegate_.AddObserver(&delegate_observer_);
     delegate_.AddObserver(&other_delegate_observer_);
   }
 
@@ skipping 193 matching lines @@
   NetworkChangeNotifier::GetConnectedNetworks(&network_list);
   EXPECT_EQ(1u, network_list.size());
   EXPECT_EQ(100, network_list[0]);
   EXPECT_EQ(NetworkChangeNotifier::kInvalidNetworkHandle,
             NetworkChangeNotifier::GetDefaultNetwork());
 
   NetworkChangeNotifier::RemoveNetworkObserver(&network_observer);
 }
 
 }  // namespace net