[CrOS Tether] Update TetherHostFetcher to use CryptAuthService instead of a Delegate.

chromeos/components/tether/tether_host_fetcher_unittest.cc

 // Copyright 2016 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.
 
 #include "chromeos/components/tether/tether_host_fetcher.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "components/cryptauth/cryptauth_device_manager.h"
+#include "components/cryptauth/fake_cryptauth_service.h"
 #include "components/cryptauth/fake_secure_message_delegate.h"
 #include "components/cryptauth/proto/cryptauth_api.pb.h"
 #include "components/cryptauth/remote_device_loader.h"
 #include "components/cryptauth/remote_device_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::Invoke;
 using testing::NiceMock;
 using testing::Return;
 
 namespace chromeos {
 
 namespace tether {
 
 namespace {
 
 const char kTestUserId[] = "testUserId";
 const char kTestUserPrivateKey[] = "kTestUserPrivateKey";
 
-class TestDelegate : public TetherHostFetcher::Delegate {
+class FakeCryptAuthServiceWithTracking
+    : public cryptauth::FakeCryptAuthService {
  public:
+  // FakeCryptAuthService:
   std::unique_ptr<cryptauth::SecureMessageDelegate>
   CreateSecureMessageDelegate() override {
     cryptauth::FakeSecureMessageDelegate* delegate =
         new cryptauth::FakeSecureMessageDelegate();
     created_delegates_.push_back(delegate);
     return base::WrapUnique(delegate);
   }
 
   void VerifySecureMessageDelegateCreatedByFactory(
       cryptauth::FakeSecureMessageDelegate* delegate) {
@@ skipping 52 matching lines @@
 
     std::unique_ptr<cryptauth::RemoteDeviceLoader> BuildInstance(
         const std::vector<cryptauth::ExternalDeviceInfo>& device_info_list,
         const std::string& user_id,
         const std::string& user_private_key,
         std::unique_ptr<cryptauth::SecureMessageDelegate>
             secure_message_delegate) override {
       EXPECT_EQ(test_->test_device_infos_.size(), device_info_list.size());
       EXPECT_EQ(std::string(kTestUserId), user_id);
       EXPECT_EQ(std::string(kTestUserPrivateKey), user_private_key);
-      test_->test_delegate_->VerifySecureMessageDelegateCreatedByFactory(
-          static_cast<cryptauth::FakeSecureMessageDelegate*>(
-              secure_message_delegate.get()));
+      test_->fake_cryptauth_service_
+          ->VerifySecureMessageDelegateCreatedByFactory(
+              static_cast<cryptauth::FakeSecureMessageDelegate*>(
+                  secure_message_delegate.get()));
 
       std::unique_ptr<MockDeviceLoader> device_loader =
           base::WrapUnique(new NiceMock<MockDeviceLoader>());
       ON_CALL(*device_loader, Load(_))
           .WillByDefault(
               Invoke(this, &TestRemoteDeviceLoaderFactory::MockLoadImpl));
       return std::move(device_loader);
     }
 
     void MockLoadImpl(
@@ skipping 13 matching lines @@
 
   TetherHostFetcherTest()
       : test_devices_(cryptauth::GenerateTestRemoteDevices(5)),
         test_device_infos_(
             CreateTetherExternalDeviceInfosForRemoteDevices(test_devices_)) {}
 
   void SetUp() override {
     device_list_list_.clear();
     single_device_list_.clear();
 
-    std::unique_ptr<TestDelegate> test_delegate =
-        base::WrapUnique(new TestDelegate());
-    test_delegate_ = test_delegate.get();
+    fake_cryptauth_service_ =
+        base::WrapUnique(new FakeCryptAuthServiceWithTracking());
 
     mock_device_manager_ = base::WrapUnique(new NiceMock<MockDeviceManager>());
     ON_CALL(*mock_device_manager_, GetTetherHosts())
         .WillByDefault(Return(test_device_infos_));
 
     test_device_loader_factory_ =
         base::WrapUnique(new TestRemoteDeviceLoaderFactory(this));
     cryptauth::RemoteDeviceLoader::Factory::SetInstanceForTesting(
         test_device_loader_factory_.get());
 
     tether_host_fetcher_ = base::MakeUnique<TetherHostFetcher>(
         std::string(kTestUserId), std::string(kTestUserPrivateKey),
-        std::move(test_delegate), mock_device_manager_.get());
+        fake_cryptauth_service_.get(), mock_device_manager_.get());
   }
 
   void OnTetherHostListFetched(const cryptauth::RemoteDeviceList& device_list) {
     device_list_list_.push_back(device_list);
   }
 
   void OnSingleTetherHostFetched(
       std::unique_ptr<cryptauth::RemoteDevice> device) {
     single_device_list_.push_back(std::move(device));
   }
 
   const std::vector<cryptauth::RemoteDevice> test_devices_;
   const std::vector<cryptauth::ExternalDeviceInfo> test_device_infos_;
 
   std::vector<cryptauth::RemoteDeviceList> device_list_list_;
   std::vector<std::shared_ptr<cryptauth::RemoteDevice>> single_device_list_;
 
-  TestDelegate* test_delegate_;
+  std::unique_ptr<FakeCryptAuthServiceWithTracking> fake_cryptauth_service_;
   std::unique_ptr<NiceMock<MockDeviceManager>> mock_device_manager_;
   std::unique_ptr<TestRemoteDeviceLoaderFactory> test_device_loader_factory_;
 
   std::unique_ptr<TetherHostFetcher> tether_host_fetcher_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TetherHostFetcherTest);
 };
 
 TEST_F(TetherHostFetcherTest, TestFetchAllTetherHosts) {
@@ skipping 68 matching lines @@
   EXPECT_EQ(1u, device_list_list_.size());
   EXPECT_EQ(test_devices_, device_list_list_[0]);
   EXPECT_EQ(2u, single_device_list_.size());
   EXPECT_EQ(test_devices_[0], *single_device_list_[0]);
   EXPECT_EQ(nullptr, single_device_list_[1]);
 }
 
 }  // namespace tether
 
 }  // namespace cryptauth