[CrOS Multidevice] Create a dependency from TetherService to SecureChannelClient.

Inject SecureChannelClient into TetherService, but not TetherComponent yet.
Injection into TetherComponent and subsequent SecureChannelClient usage will come
in subsequent CLs.

This change has allowed me to manually verify that SecureChannelService is correctly
registered at the login screen.

This CL features a small change to FakeSecureChannelClient needed to fix a build
error -- somehow it slipped by before.

Bug: 824568, 752273
Change-Id: I9ba2c35f2ed05ebc3c92b1817e54e8161512f6a8
Reviewed-on: https://chromium-review.googlesource.com/1100481
Commit-Queue: Ryan Hansberry <hansberry@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567454}

chrome/browser/chromeos/tether/fake_tether_service.cc

@@ -13,12 +13,14 @@ FakeTetherService::FakeTetherService(
     chromeos::PowerManagerClient* power_manager_client,
     cryptauth::CryptAuthService* cryptauth_service,
     chromeos::device_sync::DeviceSyncClient* device_sync_client,
+    chromeos::secure_channel::SecureChannelClient* secure_channel_client,
     chromeos::NetworkStateHandler* network_state_handler,
     session_manager::SessionManager* session_manager)
     : TetherService(profile,
                     power_manager_client,
                     cryptauth_service,
                     device_sync_client,
+                    secure_channel_client,
                     network_state_handler,
                     session_manager) {}
 

chrome/browser/chromeos/tether/fake_tether_service.h

@@ -12,12 +12,14 @@
 // chromeos::switches::kTetherStub for more details.
 class FakeTetherService : public TetherService {
  public:
-  FakeTetherService(Profile* profile,
-                    chromeos::PowerManagerClient* power_manager_client,
-                    cryptauth::CryptAuthService* cryptauth_service,
-                    chromeos::device_sync::DeviceSyncClient* device_sync_client,
-                    chromeos::NetworkStateHandler* network_state_handler,
-                    session_manager::SessionManager* session_manager);
+  FakeTetherService(
+      Profile* profile,
+      chromeos::PowerManagerClient* power_manager_client,
+      cryptauth::CryptAuthService* cryptauth_service,
+      chromeos::device_sync::DeviceSyncClient* device_sync_client,
+      chromeos::secure_channel::SecureChannelClient* secure_channel_client,
+      chromeos::NetworkStateHandler* network_state_handler,
+      session_manager::SessionManager* session_manager);
 
   // TetherService:
   void StartTetherIfPossible() override;

chrome/browser/chromeos/tether/tether_service.cc

@@ -27,6 +27,7 @@
 #include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "chromeos/services/device_sync/public/cpp/device_sync_client.h"
+#include "chromeos/services/secure_channel/public/cpp/client/secure_channel_client.h"
 #include "components/cryptauth/cryptauth_enrollment_manager.h"
 #include "components/cryptauth/cryptauth_service.h"
 #include "components/cryptauth/remote_device_provider_impl.h"
@@ -128,12 +129,14 @@ TetherService::TetherService(
     chromeos::PowerManagerClient* power_manager_client,
     cryptauth::CryptAuthService* cryptauth_service,
     chromeos::device_sync::DeviceSyncClient* device_sync_client,
+    chromeos::secure_channel::SecureChannelClient* secure_channel_client,
     chromeos::NetworkStateHandler* network_state_handler,
     session_manager::SessionManager* session_manager)
     : profile_(profile),
       power_manager_client_(power_manager_client),
       cryptauth_service_(cryptauth_service),
       device_sync_client_(device_sync_client),
+      secure_channel_client_(secure_channel_client),
       network_state_handler_(network_state_handler),
       session_manager_(session_manager),
       notification_presenter_(

chrome/browser/chromeos/tether/tether_service.h

@@ -28,6 +28,9 @@ class NetworkStateHandler;
 namespace device_sync {
 class DeviceSyncClient;
 }  // namespace device_sync
+namespace secure_channel {
+class SecureChannelClient;
+}  // namespace secure_channel
 namespace tether {
 class GmsCoreNotificationsStateTracker;
 class GmsCoreNotificationsStateTrackerImpl;
@@ -61,12 +64,14 @@ class TetherService : public KeyedService,
                       public chromeos::NetworkStateHandlerObserver,
                       public chromeos::tether::TetherComponent::Observer {
  public:
-  TetherService(Profile* profile,
-                chromeos::PowerManagerClient* power_manager_client,
-                cryptauth::CryptAuthService* cryptauth_service,
-                chromeos::device_sync::DeviceSyncClient* device_sync_client,
-                chromeos::NetworkStateHandler* network_state_handler,
-                session_manager::SessionManager* session_manager);
+  TetherService(
+      Profile* profile,
+      chromeos::PowerManagerClient* power_manager_client,
+      cryptauth::CryptAuthService* cryptauth_service,
+      chromeos::device_sync::DeviceSyncClient* device_sync_client,
+      chromeos::secure_channel::SecureChannelClient* secure_channel_client,
+      chromeos::NetworkStateHandler* network_state_handler,
+      session_manager::SessionManager* session_manager);
   ~TetherService() override;
 
   // Gets TetherService instance.
@@ -262,6 +267,7 @@ class TetherService : public KeyedService,
   chromeos::PowerManagerClient* power_manager_client_;
   cryptauth::CryptAuthService* cryptauth_service_;
   chromeos::device_sync::DeviceSyncClient* device_sync_client_;
+  chromeos::secure_channel::SecureChannelClient* secure_channel_client_;
   chromeos::NetworkStateHandler* network_state_handler_;
   session_manager::SessionManager* session_manager_;
   std::unique_ptr<chromeos::tether::NotificationPresenter>

chrome/browser/chromeos/tether/tether_service_factory.cc

@@ -9,6 +9,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/cryptauth/chrome_cryptauth_service_factory.h"
 #include "chrome/browser/chromeos/device_sync/device_sync_client_factory.h"
+#include "chrome/browser/chromeos/secure_channel/secure_channel_client_provider.h"
 #include "chrome/browser/chromeos/tether/fake_tether_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
@@ -56,6 +57,8 @@ KeyedService* TetherServiceFactory::BuildServiceInstanceFor(
             Profile::FromBrowserContext(context)),
         chromeos::device_sync::DeviceSyncClientFactory::GetForProfile(
             Profile::FromBrowserContext(context)),
+        chromeos::secure_channel::SecureChannelClientProvider::GetInstance()
+            ->GetClient(),
         chromeos::NetworkHandler::Get()->network_state_handler(),
         session_manager::SessionManager::Get());
 
@@ -75,6 +78,8 @@ KeyedService* TetherServiceFactory::BuildServiceInstanceFor(
           Profile::FromBrowserContext(context)),
       chromeos::device_sync::DeviceSyncClientFactory::GetForProfile(
           Profile::FromBrowserContext(context)),
+      chromeos::secure_channel::SecureChannelClientProvider::GetInstance()
+          ->GetClient(),
       chromeos::NetworkHandler::Get()->network_state_handler(),
       session_manager::SessionManager::Get());
 }

chrome/browser/chromeos/tether/tether_service_unittest.cc

@@ -41,6 +41,8 @@
 #include "chromeos/network/network_type_pattern.h"
 #include "chromeos/services/device_sync/public/cpp/device_sync_client_impl.h"
 #include "chromeos/services/device_sync/public/cpp/fake_device_sync_client.h"
+#include "chromeos/services/secure_channel/public/cpp/client/fake_secure_channel_client.h"
+#include "chromeos/services/secure_channel/public/cpp/client/secure_channel_client_impl.h"
 #include "components/cryptauth/cryptauth_device_manager.h"
 #include "components/cryptauth/cryptauth_enroller.h"
 #include "components/cryptauth/cryptauth_enrollment_manager.h"
@@ -106,16 +108,19 @@ class MockExtendedBluetoothAdapter : public device::MockBluetoothAdapter {
 
 class TestTetherService : public TetherService {
  public:
-  TestTetherService(Profile* profile,
-                    chromeos::PowerManagerClient* power_manager_client,
-                    cryptauth::CryptAuthService* cryptauth_service,
-                    chromeos::device_sync::DeviceSyncClient* device_sync_client,
-                    chromeos::NetworkStateHandler* network_state_handler,
-                    session_manager::SessionManager* session_manager)
+  TestTetherService(
+      Profile* profile,
+      chromeos::PowerManagerClient* power_manager_client,
+      cryptauth::CryptAuthService* cryptauth_service,
+      chromeos::device_sync::DeviceSyncClient* device_sync_client,
+      chromeos::secure_channel::SecureChannelClient* secure_channel_client,
+      chromeos::NetworkStateHandler* network_state_handler,
+      session_manager::SessionManager* session_manager)
       : TetherService(profile,
                       power_manager_client,
                       cryptauth_service,
                       device_sync_client,
+                      secure_channel_client,
                       network_state_handler,
                       session_manager) {}
   ~TestTetherService() override {}
@@ -259,6 +264,22 @@ class FakeDeviceSyncClientImplFactory
   }
 };
 
+class FakeSecureChannelClientImplFactory
+    : public chromeos::secure_channel::SecureChannelClientImpl::Factory {
+ public:
+  FakeSecureChannelClientImplFactory() = default;
+
+  ~FakeSecureChannelClientImplFactory() override = default;
+
+  // chromeos::secure_channel::SecureChannelClientImpl::Factory:
+  std::unique_ptr<chromeos::secure_channel::SecureChannelClient> BuildInstance(
+      service_manager::Connector* connector,
+      scoped_refptr<base::TaskRunner> task_runner) override {
+    return std::make_unique<
+        chromeos::secure_channel::FakeSecureChannelClient>();
+  }
+};
+
 }  // namespace
 
 class TetherServiceTest : public chromeos::NetworkStateTest {
@@ -289,12 +310,18 @@ class TetherServiceTest : public chromeos::NetworkStateTest {
 
     fake_device_sync_client_ =
         std::make_unique<chromeos::device_sync::FakeDeviceSyncClient>();
-
     fake_device_sync_client_impl_factory_ =
         std::make_unique<FakeDeviceSyncClientImplFactory>();
     chromeos::device_sync::DeviceSyncClientImpl::Factory::SetInstanceForTesting(
         fake_device_sync_client_impl_factory_.get());
 
+    fake_secure_channel_client_ =
+        std::make_unique<chromeos::secure_channel::FakeSecureChannelClient>();
+    fake_secure_channel_client_impl_factory_ =
+        std::make_unique<FakeSecureChannelClientImplFactory>();
+    chromeos::secure_channel::SecureChannelClientImpl::Factory::
+        SetInstanceForTesting(fake_secure_channel_client_impl_factory_.get());
+
     fake_cryptauth_service_ =
         std::make_unique<cryptauth::FakeCryptAuthService>();
     fake_enrollment_manager_ =
@@ -338,6 +365,8 @@ class TetherServiceTest : public chromeos::NetworkStateTest {
 
     chromeos::device_sync::DeviceSyncClientImpl::Factory::SetInstanceForTesting(
         nullptr);
+    chromeos::secure_channel::SecureChannelClientImpl::Factory::
+        SetInstanceForTesting(nullptr);
 
     ShutdownTetherService();
 
@@ -375,7 +404,8 @@ class TetherServiceTest : public chromeos::NetworkStateTest {
     tether_service_ = base::WrapUnique(new TestTetherService(
         profile_.get(), fake_power_manager_client_.get(),
         fake_cryptauth_service_.get(), fake_device_sync_client_.get(),
-        network_state_handler(), nullptr /* session_manager */));
+        fake_secure_channel_client_.get(), network_state_handler(),
+        nullptr /* session_manager */));
 
     fake_notification_presenter_ =
         new chromeos::tether::FakeNotificationPresenter();
@@ -487,6 +517,10 @@ class TetherServiceTest : public chromeos::NetworkStateTest {
       fake_device_sync_client_;
   std::unique_ptr<FakeDeviceSyncClientImplFactory>
       fake_device_sync_client_impl_factory_;
+  std::unique_ptr<chromeos::secure_channel::SecureChannelClient>
+      fake_secure_channel_client_;
+  std::unique_ptr<FakeSecureChannelClientImplFactory>
+      fake_secure_channel_client_impl_factory_;
   std::unique_ptr<cryptauth::FakeCryptAuthService> fake_cryptauth_service_;
   std::unique_ptr<cryptauth::FakeCryptAuthEnrollmentManager>
       fake_enrollment_manager_;

chromeos/services/secure_channel/public/cpp/client/fake_secure_channel_client.cc

@@ -4,7 +4,6 @@
 
 #include "chromeos/services/secure_channel/public/cpp/client/fake_secure_channel_client.h"
 
-#include "chromeos/services/secure_channel/public/cpp/client/connection_attempt.h"
 #include "components/cryptauth/remote_device_ref.h"
 
 namespace chromeos {

chromeos/services/secure_channel/public/cpp/client/fake_secure_channel_client.h

@@ -11,6 +11,7 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "chromeos/services/secure_channel/public/cpp/client/connection_attempt.h"
 #include "chromeos/services/secure_channel/public/cpp/client/secure_channel_client.h"
 #include "chromeos/services/secure_channel/public/cpp/shared/authenticated_channel.h"