Reland: Network Service: Migrate chromeos::assistant::NetworkProviderImpl to...

Reland: Network Service: Migrate chromeos::assistant::NetworkProviderImpl to NetworkConnectionTracker

The original CL is:
https://chromium-review.googlesource.com/c/chromium/src/+/1270950
and the Initial upload is the same as the original CL.

The reland CL fixes compile error on chromeos.

TBR=jam@chromium.org, stevenjb@chromium.org, xiaohuic@chromium.org, rmcelrath@chromium.org

Bug: 887040
Change-Id: Ic0cf9d07f7c7d6c5c59694c1414bc38b83a36456
Reviewed-on: https://chromium-review.googlesource.com/c/1277647Reviewed-by: Jun Cai <juncai@chromium.org>
Reviewed-by: Joel Hockey <joelhockey@chromium.org>
Commit-Queue: Jun Cai <juncai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599042}

chrome/browser/profiles/profile_impl.cc

@@ -176,6 +176,7 @@
 #if BUILDFLAG(ENABLE_CROS_ASSISTANT)
 #include "chromeos/services/assistant/public/mojom/constants.mojom.h"
 #include "chromeos/services/assistant/service.h"
+#include "content/public/browser/network_service_instance.h"
 #endif
 
 #endif
@@ -1164,8 +1165,11 @@ void ProfileImpl::RegisterInProcessServices(StaticServiceMap* services) {
   {
     service_manager::EmbeddedServiceInfo info;
     info.factory = base::BindRepeating([] {
+      network::NetworkConnectionTracker* network_connection_tracker =
+          content::GetNetworkConnectionTracker();
       return std::unique_ptr<service_manager::Service>(
-          std::make_unique<chromeos::assistant::Service>());
+          std::make_unique<chromeos::assistant::Service>(
+              network_connection_tracker));
     });
     info.task_runner = base::CreateSingleThreadTaskRunnerWithTraits(
         {content::BrowserThread::UI});

chromeos/services/assistant/BUILD.gn

@@ -80,6 +80,8 @@ source_set("lib") {
       "//libassistant/shared/internal_api/c:api_wrappers_entrypoint",
       "//libassistant/shared/public",
       "//libassistant/shared/public:export",
+      "//services/network/public/cpp",
+      "//services/network/public/mojom",
       "//ui/base",
     ]
 

chromeos/services/assistant/DEPS

@@ -10,6 +10,7 @@ include_rules = [
   "+services/audio/public",
   "+services/device/public",
   "+services/identity/public",
+  "+services/network/public",
   "+services/service_manager/public",
   "+ui/accessibility/ax_assistant_structure.h",
   "+ui/accessibility/mojom",

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -62,7 +62,8 @@ AssistantManagerServiceImpl::AssistantManagerServiceImpl(
     service_manager::Connector* connector,
     device::mojom::BatteryMonitorPtr battery_monitor,
     Service* service,
-    bool enable_hotword)
+    bool enable_hotword,
+    network::NetworkConnectionTracker* network_connection_tracker)
     : enable_hotword_(enable_hotword),
       action_module_(std::make_unique<action::CrosActionModule>(this)),
       main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
@@ -76,7 +77,7 @@ AssistantManagerServiceImpl::AssistantManagerServiceImpl(
   background_thread_.Start();
   platform_api_ = std::make_unique<PlatformApiImpl>(
       connector, std::move(battery_monitor), enable_hotword,
-      background_thread_.task_runner());
+      background_thread_.task_runner(), network_connection_tracker);
   connector->BindInterface(ash::mojom::kServiceName,
                            &voice_interaction_controller_);
   connector->BindInterface(ash::mojom::kServiceName,

chromeos/services/assistant/assistant_manager_service_impl.h

@@ -58,10 +58,12 @@ class AssistantManagerServiceImpl
       public assistant_client::DeviceStateListener {
  public:
   // |service| owns this class and must outlive this class.
-  AssistantManagerServiceImpl(service_manager::Connector* connector,
-                              device::mojom::BatteryMonitorPtr battery_monitor,
-                              Service* service,
-                              bool enable_hotword);
+  AssistantManagerServiceImpl(
+      service_manager::Connector* connector,
+      device::mojom::BatteryMonitorPtr battery_monitor,
+      Service* service,
+      bool enable_hotword,
+      network::NetworkConnectionTracker* network_connection_tracker);
 
   ~AssistantManagerServiceImpl() override;
 

chromeos/services/assistant/platform/network_provider_impl.cc

@@ -10,15 +10,26 @@ using ConnectionStatus = assistant_client::NetworkProvider::ConnectionStatus;
 namespace chromeos {
 namespace assistant {
 
-NetworkProviderImpl::NetworkProviderImpl()
-    : connection_type_(net::NetworkChangeNotifier::GetConnectionType()) {
-  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
+NetworkProviderImpl::NetworkProviderImpl(
+    network::NetworkConnectionTracker* network_connection_tracker)
+    : network_connection_tracker_(network_connection_tracker),
+      weak_factory_(this) {
+  if (network_connection_tracker_) {
+    network_connection_tracker_->AddNetworkConnectionObserver(this);
+    network_connection_tracker_->GetConnectionType(
+        &connection_type_,
+        base::BindOnce(&NetworkProviderImpl::OnConnectionChanged,
+                       weak_factory_.GetWeakPtr()));
+  }
 }
 
-NetworkProviderImpl::~NetworkProviderImpl() = default;
+NetworkProviderImpl::~NetworkProviderImpl() {
+  if (network_connection_tracker_)
+    network_connection_tracker_->RemoveNetworkConnectionObserver(this);
+}
 
-void NetworkProviderImpl::OnNetworkChanged(
-    net::NetworkChangeNotifier::ConnectionType type) {
+void NetworkProviderImpl::OnConnectionChanged(
+    network::mojom::ConnectionType type) {
   connection_type_ = type;
 }
 
@@ -26,16 +37,16 @@ ConnectionStatus NetworkProviderImpl::GetConnectionStatus() {
   // TODO(updowndota): Check actual internect connectivity in addition to the
   // physical connectivity.
   switch (connection_type_) {
-    case net::NetworkChangeNotifier::CONNECTION_UNKNOWN:
+    case network::mojom::ConnectionType::CONNECTION_UNKNOWN:
       return ConnectionStatus::UNKNOWN;
-    case net::NetworkChangeNotifier::CONNECTION_ETHERNET:
-    case net::NetworkChangeNotifier::CONNECTION_WIFI:
-    case net::NetworkChangeNotifier::CONNECTION_2G:
-    case net::NetworkChangeNotifier::CONNECTION_3G:
-    case net::NetworkChangeNotifier::CONNECTION_4G:
-    case net::NetworkChangeNotifier::CONNECTION_BLUETOOTH:
+    case network::mojom::ConnectionType::CONNECTION_ETHERNET:
+    case network::mojom::ConnectionType::CONNECTION_WIFI:
+    case network::mojom::ConnectionType::CONNECTION_2G:
+    case network::mojom::ConnectionType::CONNECTION_3G:
+    case network::mojom::ConnectionType::CONNECTION_4G:
+    case network::mojom::ConnectionType::CONNECTION_BLUETOOTH:
       return ConnectionStatus::CONNECTED;
-    case net::NetworkChangeNotifier::CONNECTION_NONE:
+    case network::mojom::ConnectionType::CONNECTION_NONE:
       return ConnectionStatus::DISCONNECTED_FROM_INTERNET;
   }
 }

chromeos/services/assistant/platform/network_provider_impl.h

@@ -6,29 +6,33 @@
 #define CHROMEOS_SERVICES_ASSISTANT_PLATFORM_NETWORK_PROVIDER_IMPL_H_
 
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
 #include "libassistant/shared/public/platform_net.h"
-#include "net/base/network_change_notifier.h"
+#include "services/network/public/cpp/network_connection_tracker.h"
+#include "services/network/public/mojom/network_change_manager.mojom.h"
 
 namespace chromeos {
 namespace assistant {
 
 class NetworkProviderImpl
     : public assistant_client::NetworkProvider,
-      public net::NetworkChangeNotifier::NetworkChangeObserver {
+      public network::NetworkConnectionTracker::NetworkConnectionObserver {
  public:
-  NetworkProviderImpl();
+  explicit NetworkProviderImpl(
+      network::NetworkConnectionTracker* network_connection_tracker);
   ~NetworkProviderImpl() override;
 
-  // net::NetworkChangeNotifier overrides:
-  void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) override;
+  // network::NetworkConnectionTracker::NetworkConnectionObserver:
+  void OnConnectionChanged(network::mojom::ConnectionType type) override;
 
   // assistant_client::NetworkProvider::NetworkChangeObserver overrides:
   ConnectionStatus GetConnectionStatus() override;
   assistant_client::MdnsResponder* GetMdnsResponder() override;
 
  private:
-  net::NetworkChangeNotifier::ConnectionType connection_type_;
+  network::NetworkConnectionTracker* network_connection_tracker_;
+  network::mojom::ConnectionType connection_type_;
+  base::WeakPtrFactory<NetworkProviderImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkProviderImpl);
 };

chromeos/services/assistant/platform_api_impl.cc

@@ -75,9 +75,11 @@ PlatformApiImpl::PlatformApiImpl(
     service_manager::Connector* connector,
     device::mojom::BatteryMonitorPtr battery_monitor,
     bool enable_hotword,
-    scoped_refptr<base::SingleThreadTaskRunner> background_task_runner)
+    scoped_refptr<base::SingleThreadTaskRunner> background_task_runner,
+    network::NetworkConnectionTracker* network_connection_tracker)
     : audio_input_provider_(connector, enable_hotword),
       audio_output_provider_(connector, background_task_runner),
+      network_provider_(network_connection_tracker),
       system_provider_(std::move(battery_monitor)) {}
 
 PlatformApiImpl::~PlatformApiImpl() = default;

chromeos/services/assistant/platform_api_impl.h

@@ -34,7 +34,8 @@ class PlatformApiImpl : public assistant_client::PlatformApi {
       service_manager::Connector* connector,
       device::mojom::BatteryMonitorPtr battery_monitor,
       bool enable_hotword,
-      scoped_refptr<base::SingleThreadTaskRunner> background_task_runner);
+      scoped_refptr<base::SingleThreadTaskRunner> background_task_runner,
+      network::NetworkConnectionTracker* network_connection_tracker);
   ~PlatformApiImpl() override;
 
   // assistant_client::PlatformApi overrides

chromeos/services/assistant/service.cc

@@ -52,13 +52,14 @@ constexpr base::TimeDelta kMaxTokenRefreshDelay =
 
 }  // namespace
 
-Service::Service()
+Service::Service(network::NetworkConnectionTracker* network_connection_tracker)
     : platform_binding_(this),
       session_observer_binding_(this),
       token_refresh_timer_(std::make_unique<base::OneShotTimer>()),
       main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       power_manager_observer_(this),
       voice_interaction_observer_binding_(this),
+      network_connection_tracker_(network_connection_tracker),
       weak_ptr_factory_(this) {
   registry_.AddInterface<mojom::AssistantPlatform>(base::BindRepeating(
       &Service::BindAssistantPlatformConnection, base::Unretained(this)));
@@ -283,7 +284,8 @@ void Service::CreateAssistantManagerService(bool enable_hotword) {
   context()->connector()->BindInterface(device::mojom::kServiceName,
                                         mojo::MakeRequest(&battery_monitor));
   assistant_manager_service_ = std::make_unique<AssistantManagerServiceImpl>(
-      context()->connector(), std::move(battery_monitor), this, enable_hotword);
+      context()->connector(), std::move(battery_monitor), this, enable_hotword,
+      network_connection_tracker_);
 
   // Bind to Assistant controller in ash.
   context()->connector()->BindInterface(ash::mojom::kServiceName,

chromeos/services/assistant/service.h

@@ -33,6 +33,10 @@ namespace base {
 class OneShotTimer;
 }
 
+namespace network {
+class NetworkConnectionTracker;
+}  // namespace network
+
 namespace chromeos {
 namespace assistant {
 
@@ -45,7 +49,8 @@ class Service : public service_manager::Service,
                 public mojom::AssistantPlatform,
                 public ash::mojom::VoiceInteractionObserver {
  public:
-  Service();
+  explicit Service(
+      network::NetworkConnectionTracker* network_connection_tracker);
   ~Service() override;
 
   mojom::Client* client() { return client_.get(); }
@@ -154,6 +159,8 @@ class Service : public service_manager::Service,
   mojo::Binding<ash::mojom::VoiceInteractionObserver>
       voice_interaction_observer_binding_;
 
+  network::NetworkConnectionTracker* network_connection_tracker_;
+
   base::WeakPtrFactory<Service> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Service);

chromeos/services/assistant/service_unittest.cc

@@ -177,7 +177,8 @@ class ServiceTestClient : public service_manager::test::ServiceTestClient,
       const std::string& name,
       service_manager::mojom::PIDReceiverPtr pid_receiver) override {
     if (name == mojom::kServiceName) {
-      auto service = std::make_unique<chromeos::assistant::Service>();
+      auto service = std::make_unique<chromeos::assistant::Service>(
+          nullptr /* network_connection_tracker */);
 
       auto mock_timer = std::make_unique<base::OneShotTimer>(
           mock_task_runner_->GetMockTickClock());