Change NetworkChangeNotifier::Create to return a unique_ptr

Bug: 773279
Change-Id: I94755a278ef07f49d5449e96bc0451bc77966237
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1657350Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Paul Jensen <pauljensen@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Erik Anderson <Erik.Anderson@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#670092}

android_webview/browser/net/aw_network_change_notifier_factory.cc

@@ -5,6 +5,7 @@
 #include "android_webview/browser/net/aw_network_change_notifier_factory.h"
 
 #include "android_webview/browser/net/aw_network_change_notifier.h"
+#include "base/memory/ptr_util.h"
 
 namespace android_webview {
 
@@ -12,8 +13,9 @@ AwNetworkChangeNotifierFactory::AwNetworkChangeNotifierFactory() {}
 
 AwNetworkChangeNotifierFactory::~AwNetworkChangeNotifierFactory() {}
 
-net::NetworkChangeNotifier* AwNetworkChangeNotifierFactory::CreateInstance() {
-  return new AwNetworkChangeNotifier(&delegate_);
+std::unique_ptr<net::NetworkChangeNotifier>
+AwNetworkChangeNotifierFactory::CreateInstance() {
+  return base::WrapUnique(new AwNetworkChangeNotifier(&delegate_));
 }
 
 }  // namespace android_webview

android_webview/browser/net/aw_network_change_notifier_factory.h

@@ -5,6 +5,8 @@
 #ifndef ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_CHANGE_NOTIFIER_FACTORY_H_
 #define ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_CHANGE_NOTIFIER_FACTORY_H_
 
+#include <memory>
+
 #include "net/android/network_change_notifier_delegate_android.h"
 #include "net/base/network_change_notifier_factory.h"
 
@@ -27,7 +29,7 @@ class AwNetworkChangeNotifierFactory :
   ~AwNetworkChangeNotifierFactory() override;
 
   // NetworkChangeNotifierFactory:
-  net::NetworkChangeNotifier* CreateInstance() override;
+  std::unique_ptr<net::NetworkChangeNotifier> CreateInstance() override;
 
  private:
   // Delegate passed to the instances created by this class.

chrome/browser/chromeos/network_change_manager_client_unittest.cc

@@ -113,7 +113,7 @@ TEST(NetworkChangeManagerClientTest,
   content::TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<net::NetworkChangeNotifierPosix> network_change_notifier(
       static_cast<net::NetworkChangeNotifierPosix*>(
-          net::NetworkChangeNotifier::Create()));
+          net::NetworkChangeNotifier::Create().release()));
   network_change_notifier->OnConnectionChanged(
       net::NetworkChangeNotifier::CONNECTION_UNKNOWN);
   EXPECT_EQ(net::NetworkChangeNotifier::CONNECTION_UNKNOWN,
@@ -150,7 +150,7 @@ class NetworkChangeManagerClientUpdateTest : public testing::Test {
   ~NetworkChangeManagerClientUpdateTest() override = default;
 
   void SetUp() override {
-    network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
+    network_change_notifier_ = net::NetworkChangeNotifier::Create();
     DBusThreadManager::Initialize();
     PowerManagerClient::InitializeFake();
     NetworkHandler::Initialize();

chrome/service/service_process.cc

@@ -170,7 +170,7 @@ bool ServiceProcess::Initialize(base::OnceClosure quit_closure,
 
   // The NetworkChangeNotifier must be created after ThreadPool because it
   // posts tasks to it.
-  network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
+  network_change_notifier_ = net::NetworkChangeNotifier::Create();
   network_connection_tracker_ =
       std::make_unique<InProcessNetworkConnectionTracker>();
 

chromecast/net/network_change_notifier_factory_cast.cc

@@ -9,9 +9,11 @@
 
 namespace chromecast {
 
-net::NetworkChangeNotifier* NetworkChangeNotifierFactoryCast::CreateInstance() {
+std::unique_ptr<net::NetworkChangeNotifier>
+NetworkChangeNotifierFactoryCast::CreateInstance() {
   // Caller assumes ownership.
-  return new net::NetworkChangeNotifierLinux(GetIgnoredInterfaces());
+  return std::make_unique<net::NetworkChangeNotifierLinux>(
+      GetIgnoredInterfaces());
 }
 
 NetworkChangeNotifierFactoryCast::~NetworkChangeNotifierFactoryCast() {

chromecast/net/network_change_notifier_factory_cast.h

@@ -18,7 +18,7 @@ class NetworkChangeNotifierFactoryCast
   ~NetworkChangeNotifierFactoryCast() override;
 
   // net::NetworkChangeNotifierFactory implementation:
-  net::NetworkChangeNotifier* CreateInstance() override;
+  std::unique_ptr<net::NetworkChangeNotifier> CreateInstance() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierFactoryCast);

chromecast/net/network_change_notifier_factory_fuchsia.cc

@@ -12,7 +12,7 @@
 
 namespace chromecast {
 
-net::NetworkChangeNotifier*
+std::unique_ptr<net::NetworkChangeNotifier>
 NetworkChangeNotifierFactoryFuchsia::CreateInstance() {
   uint32_t required_features =
       GetSwitchValueBoolean(switches::kRequireWlan, false)
@@ -20,7 +20,7 @@ NetworkChangeNotifierFactoryFuchsia::CreateInstance() {
           : 0;
 
   // Caller assumes ownership.
-  return new net::NetworkChangeNotifierFuchsia(required_features);
+  return std::make_unique<net::NetworkChangeNotifierFuchsia>(required_features);
 }
 
 NetworkChangeNotifierFactoryFuchsia::NetworkChangeNotifierFactoryFuchsia() =

chromecast/net/network_change_notifier_factory_fuchsia.h

@@ -17,7 +17,7 @@ class NetworkChangeNotifierFactoryFuchsia
   ~NetworkChangeNotifierFactoryFuchsia() override;
 
   // net::NetworkChangeNotifierFactory implementation:
-  net::NetworkChangeNotifier* CreateInstance() override;
+  std::unique_ptr<net::NetworkChangeNotifier> CreateInstance() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierFactoryFuchsia);

components/cronet/android/cronet_library_loader.cc

@@ -55,7 +55,7 @@ namespace {
 base::SingleThreadTaskExecutor* g_init_task_executor = nullptr;
 
 #if !BUILDFLAG(INTEGRATED_MODE)
-net::NetworkChangeNotifier* g_network_change_notifier = nullptr;
+std::unique_ptr<net::NetworkChangeNotifier> g_network_change_notifier;
 #endif
 
 base::WaitableEvent g_init_thread_init_done(

content/browser/browser_main_loop.cc

@@ -707,7 +707,7 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
     // On Android if reduced mode started network service this would already be
     //  created.
     if (!net::NetworkChangeNotifier::HasNetworkChangeNotifier())
-      network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
+      network_change_notifier_ = net::NetworkChangeNotifier::Create();
   }
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ScreenlockMonitor");

ios/web/init/ios_global_state.mm

@@ -58,7 +58,7 @@ void DestroySingleThreadTaskExecutor() {
 void CreateNetworkChangeNotifier() {
   static dispatch_once_t once_token;
   dispatch_once(&once_token, ^{
-    g_network_change_notifer = net::NetworkChangeNotifier::Create();
+    g_network_change_notifer = net::NetworkChangeNotifier::Create().release();
   });
 }
 

net/android/network_change_notifier_factory_android.cc

@@ -4,6 +4,7 @@
 
 #include "net/android/network_change_notifier_factory_android.h"
 
+#include "base/memory/ptr_util.h"
 #include "net/android/network_change_notifier_android.h"
 #include "net/android/network_change_notifier_delegate_android.h"
 
@@ -13,8 +14,9 @@ NetworkChangeNotifierFactoryAndroid::NetworkChangeNotifierFactoryAndroid() {}
 
 NetworkChangeNotifierFactoryAndroid::~NetworkChangeNotifierFactoryAndroid() {}
 
-NetworkChangeNotifier* NetworkChangeNotifierFactoryAndroid::CreateInstance() {
-  return new NetworkChangeNotifierAndroid(&delegate_);
+std::unique_ptr<NetworkChangeNotifier>
+NetworkChangeNotifierFactoryAndroid::CreateInstance() {
+  return base::WrapUnique(new NetworkChangeNotifierAndroid(&delegate_));
 }
 
 }  // namespace net

net/android/network_change_notifier_factory_android.h

@@ -29,7 +29,7 @@ class NET_EXPORT NetworkChangeNotifierFactoryAndroid :
   ~NetworkChangeNotifierFactoryAndroid() override;
 
   // NetworkChangeNotifierFactory:
-  NetworkChangeNotifier* CreateInstance() override;
+  std::unique_ptr<NetworkChangeNotifier> CreateInstance() override;
 
  private:
   // Delegate passed to the instances created by this class.

net/base/network_change_notifier.cc

@@ -199,13 +199,13 @@ void NetworkChangeNotifier::SetFactory(
 }
 
 // static
-NetworkChangeNotifier* NetworkChangeNotifier::Create() {
+std::unique_ptr<NetworkChangeNotifier> NetworkChangeNotifier::Create() {
   if (g_network_change_notifier_factory)
     return g_network_change_notifier_factory->CreateInstance();
 
 #if defined(OS_WIN)
-  NetworkChangeNotifierWin* network_change_notifier =
-      new NetworkChangeNotifierWin();
+  std::unique_ptr<NetworkChangeNotifierWin> network_change_notifier =
+      std::make_unique<NetworkChangeNotifierWin>();
   network_change_notifier->WatchForAddressChange();
   return network_change_notifier;
 #elif defined(OS_ANDROID)
@@ -213,13 +213,16 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() {
   CHECK(false);
   return NULL;
 #elif defined(OS_CHROMEOS)
-  return new NetworkChangeNotifierPosix(CONNECTION_NONE, SUBTYPE_NONE);
+  return std::make_unique<NetworkChangeNotifierPosix>(CONNECTION_NONE,
+                                                      SUBTYPE_NONE);
 #elif defined(OS_LINUX)
-  return new NetworkChangeNotifierLinux(std::unordered_set<std::string>());
+  return std::make_unique<NetworkChangeNotifierLinux>(
+      std::unordered_set<std::string>());
 #elif defined(OS_MACOSX)
-  return new NetworkChangeNotifierMac();
+  return std::make_unique<NetworkChangeNotifierMac>();
 #elif defined(OS_FUCHSIA)
-  return new NetworkChangeNotifierFuchsia(0 /* required_features */);
+  return std::make_unique<NetworkChangeNotifierFuchsia>(
+      0 /* required_features */);
 #else
   NOTIMPLEMENTED();
   return NULL;
@@ -485,8 +488,8 @@ NetworkChangeNotifier::ConnectionTypeFromInterfaceList(
 }
 
 // static
-NetworkChangeNotifier* NetworkChangeNotifier::CreateMock() {
-  return new MockNetworkChangeNotifier();
+std::unique_ptr<NetworkChangeNotifier> NetworkChangeNotifier::CreateMock() {
+  return std::make_unique<MockNetworkChangeNotifier>();
 }
 
 NetworkChangeNotifier::IPAddressObserver::IPAddressObserver() = default;

net/base/network_change_notifier.h

@@ -292,7 +292,7 @@ class NET_EXPORT NetworkChangeNotifier {
   // monitored), but if you do create it, you must do so before any other
   // threads try to access the API below, and it must outlive all other threads
   // which might try to use it.
-  static NetworkChangeNotifier* Create();
+  static std::unique_ptr<NetworkChangeNotifier> Create();
 
   // Returns whether the process-wide, platform-specific NetworkChangeNotifier
   // has been created.
@@ -401,7 +401,7 @@ class NET_EXPORT NetworkChangeNotifier {
 
   // Like Create(), but for use in tests.  The mock object doesn't monitor any
   // events, it merely rebroadcasts notifications when requested.
-  static NetworkChangeNotifier* CreateMock();
+  static std::unique_ptr<NetworkChangeNotifier> CreateMock();
 
   // Registers |observer| to receive notifications of network changes.  The
   // thread on which this is called is the thread on which |observer| will be

net/base/network_change_notifier_factory.h

@@ -5,6 +5,8 @@
 #ifndef NET_BASE_NETWORK_CHANGE_NOTIFIER_FACTORY_H_
 #define NET_BASE_NETWORK_CHANGE_NOTIFIER_FACTORY_H_
 
+#include <memory>
+
 #include "net/base/net_export.h"
 
 namespace net {
@@ -16,7 +18,7 @@ class NET_EXPORT NetworkChangeNotifierFactory {
  public:
   NetworkChangeNotifierFactory() {}
   virtual ~NetworkChangeNotifierFactory() {}
-  virtual NetworkChangeNotifier* CreateInstance() = 0;
+  virtual std::unique_ptr<NetworkChangeNotifier> CreateInstance() = 0;
 };
 
 }  // namespace net

net/base/network_change_notifier_linux.h

@@ -33,10 +33,11 @@ class NET_EXPORT_PRIVATE NetworkChangeNotifierLinux
   explicit NetworkChangeNotifierLinux(
       const std::unordered_set<std::string>& ignored_interfaces);
 
+  ~NetworkChangeNotifierLinux() override;
+
  private:
   class BlockingThreadObjects;
 
-  ~NetworkChangeNotifierLinux() override;
   static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsLinux();
 
   // NetworkChangeNotifier:

net/base/network_change_notifier_win.h

@@ -37,6 +37,7 @@ class NET_EXPORT_PRIVATE NetworkChangeNotifierWin
       public base::win::ObjectWatcher::Delegate {
  public:
   NetworkChangeNotifierWin();
+  ~NetworkChangeNotifierWin() override;
 
   // Begins listening for a single subsequent address change.  If it fails to
   // start watching, it retries on a timer.  Must be called only once, on the
@@ -48,7 +49,6 @@ class NET_EXPORT_PRIVATE NetworkChangeNotifierWin
   void WatchForAddressChange();
 
  protected:
-  ~NetworkChangeNotifierWin() override;
 
   // For unit tests only.
   bool is_watching() { return is_watching_; }

net/test/net_test_suite.cc

@@ -35,7 +35,7 @@ void NetTestSuite::Shutdown() {
 }
 
 void NetTestSuite::InitializeTestThread() {
-  network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock());
+  network_change_notifier_ = net::NetworkChangeNotifier::CreateMock();
 
   InitializeTestThreadNoNetworkChangeNotifier();
 }

remoting/host/chromoting_host_unittest.cc

@@ -65,7 +65,7 @@ class ChromotingHostTest : public testing::Test {
   ChromotingHostTest() = default;
 
   void SetUp() override {
-    network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
+    network_change_notifier_ = net::NetworkChangeNotifier::Create();
 
     task_runner_ = new AutoThreadTaskRunner(base::ThreadTaskRunnerHandle::Get(),
                                             base::DoNothing());

remoting/host/it2me/it2me_host_unittest.cc

@@ -215,7 +215,7 @@ void It2MeHostTest::SetUp() {
 #endif
   run_loop_.reset(new base::RunLoop());
 
-  network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
+  network_change_notifier_ = net::NetworkChangeNotifier::Create();
 
   host_context_ = ChromotingHostContext::Create(new AutoThreadTaskRunner(
       base::ThreadTaskRunnerHandle::Get(), run_loop_->QuitClosure()));

remoting/test/protocol_perftest.cc

@@ -119,7 +119,7 @@ class ProtocolPerfTest
     encode_thread_.Start();
     decode_thread_.Start();
 
-    network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
+    network_change_notifier_ = net::NetworkChangeNotifier::Create();
 
     desktop_environment_factory_.reset(
         new FakeDesktopEnvironmentFactory(capture_thread_.task_runner()));

services/device/geolocation/geolocation_service_unittest.cc

@@ -43,7 +43,7 @@ class GeolocationServiceUnitTest : public DeviceServiceTestBase {
     chromeos::shill_clients::InitializeFakes();
     chromeos::NetworkHandler::Initialize();
 #endif
-    network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock());
+    network_change_notifier_ = net::NetworkChangeNotifier::CreateMock();
     // We need to initialize the above *before* the base fixture instantiates
     // the device service.
     DeviceServiceTestBase::SetUp();

services/network/dns_config_change_manager_unittest.cc

@@ -63,8 +63,8 @@ class DnsConfigChangeManagerTest : public testing::Test {
 
  private:
   base::test::ScopedTaskEnvironment scoped_task_environment_;
-  std::unique_ptr<net::NetworkChangeNotifier> notifier_mock_{
-      net::NetworkChangeNotifier::CreateMock()};
+  std::unique_ptr<net::NetworkChangeNotifier> notifier_mock_ =
+      net::NetworkChangeNotifier::CreateMock();
   DnsConfigChangeManager manager_;
   TestDnsConfigChangeManagerClient client_{&manager_};
 

services/network/network_change_manager_unittest.cc

@@ -92,7 +92,7 @@ class NetworkChangeManagerTest : public testing::Test {
  public:
   NetworkChangeManagerTest()
       : network_change_manager_(new NetworkChangeManager(
-            base::WrapUnique(net::NetworkChangeNotifier::CreateMock()))) {
+            net::NetworkChangeNotifier::CreateMock())) {
     network_change_manager_client_ =
         std::make_unique<TestNetworkChangeManagerClient>(
             network_change_manager_.get());

services/network/network_service.cc

@@ -102,7 +102,7 @@ std::unique_ptr<net::NetworkChangeNotifier> CreateNetworkChangeNotifierIfNeeded(
     NOTIMPLEMENTED();
     return nullptr;
 #else
-    return base::WrapUnique(net::NetworkChangeNotifier::Create());
+    return net::NetworkChangeNotifier::Create();
 #endif
   }
   return nullptr;