device/fido: rename TransportAvailibilityObserver to just Observer

Seems like we're going to want to make this more generic to cope with
PIN support.

Change-Id: I230f317e364a8072b02ffe577b33232c5b9b9786
Reviewed-on: https://chromium-review.googlesource.com/c/1475008
Auto-Submit: Adam Langley <agl@chromium.org>
Reviewed-by: Martin Kreichgauer <martinkr@google.com>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#632810}

chrome/browser/webauthn/chrome_authenticator_request_delegate.h

@@ -87,7 +87,7 @@ class ChromeAuthenticatorRequestDelegate
   void DisableUI() override;
   bool IsWebAuthnUIEnabled() override;
 
-  // device::FidoRequestHandlerBase::TransportAvailabilityObserver:
+  // device::FidoRequestHandlerBase::Observer:
   void OnTransportAvailabilityEnumerated(
       device::FidoRequestHandlerBase::TransportAvailabilityInfo data) override;
   bool EmbedderControlsAuthenticatorDispatch(

content/public/browser/authenticator_request_client_delegate.h

@@ -31,7 +31,7 @@ namespace content {
 //
 // [1]: See https://www.w3.org/TR/webauthn/.
 class CONTENT_EXPORT AuthenticatorRequestClientDelegate
-    : public device::FidoRequestHandlerBase::TransportAvailabilityObserver {
+    : public device::FidoRequestHandlerBase::Observer {
  public:
   // Failure reasons that might be of interest to the user, so the embedder may
   // decide to inform the user.
@@ -109,7 +109,7 @@ class CONTENT_EXPORT AuthenticatorRequestClientDelegate
 
   virtual bool IsWebAuthnUIEnabled();
 
-  // device::FidoRequestHandlerBase::TransportAvailabilityObserver:
+  // device::FidoRequestHandlerBase::Observer:
   void OnTransportAvailabilityEnumerated(
       device::FidoRequestHandlerBase::TransportAvailabilityInfo data) override;
   // If true, the request handler will defer dispatch of its request onto the

device/fido/ble_adapter_manager_unittest.cc

@@ -30,11 +30,10 @@ constexpr char kTestFidoBleAuthenticatorId[] = "ble:test_device_address";
 constexpr char kTestPinCode[] = "1234";
 constexpr char kTestBluetoothDisplayName[] = "device_name";
 
-class MockTransportAvailabilityObserver
-    : public FidoRequestHandlerBase::TransportAvailabilityObserver {
+class MockObserver : public FidoRequestHandlerBase::Observer {
  public:
-  MockTransportAvailabilityObserver() = default;
-  ~MockTransportAvailabilityObserver() override = default;
+  MockObserver() = default;
+  ~MockObserver() override = default;
 
   MOCK_METHOD1(OnTransportAvailabilityEnumerated,
                void(FidoRequestHandlerBase::TransportAvailabilityInfo data));
@@ -51,13 +50,12 @@ class MockTransportAvailabilityObserver
                void(base::StringPiece, bool));
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MockTransportAvailabilityObserver);
+  DISALLOW_COPY_AND_ASSIGN(MockObserver);
 };
 
 class FakeFidoRequestHandlerBase : public FidoRequestHandlerBase {
  public:
-  explicit FakeFidoRequestHandlerBase(
-      MockTransportAvailabilityObserver* observer)
+  explicit FakeFidoRequestHandlerBase(MockObserver* observer)
       : FidoRequestHandlerBase(nullptr, {}) {
     set_observer(observer);
   }
@@ -102,7 +100,7 @@ class FidoBleAdapterManagerTest : public ::testing::Test {
   }
 
   MockBluetoothAdapter* adapter() { return adapter_.get(); }
-  MockTransportAvailabilityObserver* observer() { return mock_observer_.get(); }
+  MockObserver* observer() { return mock_observer_.get(); }
   bool adapter_powered_on_programmatically(
       const BleAdapterManager& adapter_manager) {
     return adapter_manager.adapter_powered_on_programmatically_;
@@ -126,8 +124,8 @@ class FidoBleAdapterManagerTest : public ::testing::Test {
   base::test::ScopedTaskEnvironment scoped_task_environment_;
   scoped_refptr<MockBluetoothAdapter> adapter_ =
       base::MakeRefCounted<::testing::NiceMock<MockBluetoothAdapter>>();
-  std::unique_ptr<MockTransportAvailabilityObserver> mock_observer_ =
-      std::make_unique<MockTransportAvailabilityObserver>();
+  std::unique_ptr<MockObserver> mock_observer_ =
+      std::make_unique<MockObserver>();
   std::unique_ptr<FakeFidoRequestHandlerBase> fake_request_handler_ =
       std::make_unique<FakeFidoRequestHandlerBase>(mock_observer_.get());
 };

device/fido/fido_request_handler_base.cc

@@ -48,10 +48,9 @@ FidoRequestHandlerBase::TransportAvailabilityInfo::operator=(
 FidoRequestHandlerBase::TransportAvailabilityInfo::
     ~TransportAvailabilityInfo() = default;
 
-// FidoRequestHandlerBase::TransportAvailabilityObserver ----------------------
+// FidoRequestHandlerBase::Observer ----------------------
 
-FidoRequestHandlerBase::TransportAvailabilityObserver::
-    ~TransportAvailabilityObserver() = default;
+FidoRequestHandlerBase::Observer::~Observer() = default;
 
 // FidoRequestHandlerBase -----------------------------------------------------
 

device/fido/fido_request_handler_base.h

@@ -106,13 +106,13 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoRequestHandlerBase
     // If true, dispatch of the request cannot be controlled by
     // the embedder. The embedder must not display a UI for this
     // request and must ignore all subsequent invocations of the
-    // TransportAvailabilityObserver interface methods.
+    // Observer interface methods.
     bool disable_embedder_ui = false;
   };
 
-  class COMPONENT_EXPORT(DEVICE_FIDO) TransportAvailabilityObserver {
+  class COMPONENT_EXPORT(DEVICE_FIDO) Observer {
    public:
-    virtual ~TransportAvailabilityObserver();
+    virtual ~Observer();
 
     // This method will not be invoked until the observer is set.
     virtual void OnTransportAvailabilityEnumerated(
@@ -179,7 +179,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoRequestHandlerBase
 
   base::WeakPtr<FidoRequestHandlerBase> GetWeakPtr();
 
-  void set_observer(TransportAvailabilityObserver* observer) {
+  void set_observer(Observer* observer) {
     DCHECK(!observer_) << "Only one observer is supported.";
     observer_ = observer;
 
@@ -220,7 +220,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoRequestHandlerBase
   std::vector<std::unique_ptr<FidoDiscoveryBase>>& discoveries() {
     return discoveries_;
   }
-  TransportAvailabilityObserver* observer() const { return observer_; }
+  Observer* observer() const { return observer_; }
 
   // FidoDiscoveryBase::Observer
   void AuthenticatorAdded(FidoDiscoveryBase* discovery,
@@ -256,7 +256,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoRequestHandlerBase
 
   AuthenticatorMap active_authenticators_;
   std::vector<std::unique_ptr<FidoDiscoveryBase>> discoveries_;
-  TransportAvailabilityObserver* observer_ = nullptr;
+  Observer* observer_ = nullptr;
   TransportAvailabilityInfo transport_availability_info_;
   base::RepeatingClosure notify_observer_callback_;
   std::unique_ptr<BleAdapterManager> bluetooth_adapter_manager_;

device/fido/fido_request_handler_unittest.cc

@@ -65,16 +65,15 @@ class EmptyRequestHandler : public FidoRequestHandler<std::vector<uint8_t>> {
   void DispatchRequest(FidoAuthenticator* authenticator) override {}
 };
 
-class TestTransportAvailabilityObserver
-    : public FidoRequestHandlerBase::TransportAvailabilityObserver {
+class TestObserver : public FidoRequestHandlerBase::Observer {
  public:
   using TransportAvailabilityNotificationReceiver = test::TestCallbackReceiver<
       FidoRequestHandlerBase::TransportAvailabilityInfo>;
   using AuthenticatorIdChangeNotificationReceiver =
       test::TestCallbackReceiver<std::string>;
 
-  TestTransportAvailabilityObserver() {}
-  ~TestTransportAvailabilityObserver() override {}
+  TestObserver() {}
+  ~TestObserver() override {}
 
   FidoRequestHandlerBase::TransportAvailabilityInfo
   WaitForTransportAvailabilityInfo() {
@@ -104,7 +103,7 @@ class TestTransportAvailabilityObserver
   }
 
  protected:
-  // FidoRequestHandlerBase::TransportAvailabilityObserver:
+  // FidoRequestHandlerBase::Observer:
   void OnTransportAvailabilityEnumerated(
       FidoRequestHandlerBase::TransportAvailabilityInfo data) override {
     transport_availability_notification_receiver_.callback().Run(
@@ -133,7 +132,7 @@ class TestTransportAvailabilityObserver
   AuthenticatorIdChangeNotificationReceiver
       authenticator_id_change_notification_receiver_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestTransportAvailabilityObserver);
+  DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
 // Fake FidoTask implementation that sends an empty byte array to the device
@@ -530,7 +529,7 @@ TEST_F(FidoRequestHandlerTest, TestSetPlatformAuthenticator) {
   auto authenticator =
       std::make_unique<FidoDeviceAuthenticator>(std::move(device));
 
-  TestTransportAvailabilityObserver observer;
+  TestObserver observer;
   auto request_handler = std::make_unique<FakeFidoRequestHandler>(
       base::flat_set<FidoTransportProtocol>({FidoTransportProtocol::kInternal}),
       callback().callback());
@@ -566,7 +565,7 @@ TEST_F(FidoRequestHandlerTest,
   auto authenticator =
       std::make_unique<FidoDeviceAuthenticator>(std::move(device));
 
-  TestTransportAvailabilityObserver observer;
+  TestObserver observer;
   auto request_handler = std::make_unique<FakeFidoRequestHandler>(
       base::flat_set<FidoTransportProtocol>({FidoTransportProtocol::kInternal}),
       callback().callback());
@@ -584,7 +583,7 @@ TEST_F(FidoRequestHandlerTest,
 }
 
 TEST_F(FidoRequestHandlerTest, InternalTransportDisallowedIfMarkedUnavailable) {
-  TestTransportAvailabilityObserver observer;
+  TestObserver observer;
   auto request_handler = std::make_unique<FakeFidoRequestHandler>(
       base::flat_set<FidoTransportProtocol>({FidoTransportProtocol::kInternal}),
       callback().callback());
@@ -597,7 +596,7 @@ TEST_F(FidoRequestHandlerTest, InternalTransportDisallowedIfMarkedUnavailable) {
 TEST_F(FidoRequestHandlerTest, BleTransportAllowedIfBluetoothAdapterPresent) {
   EXPECT_CALL(*adapter(), IsPresent()).WillOnce(::testing::Return(true));
 
-  TestTransportAvailabilityObserver observer;
+  TestObserver observer;
   auto request_handler = CreateFakeHandler();
   request_handler->set_observer(&observer);
 
@@ -610,7 +609,7 @@ TEST_F(FidoRequestHandlerTest,
        BleTransportDisallowedBluetoothAdapterNotPresent) {
   EXPECT_CALL(*adapter(), IsPresent()).WillOnce(::testing::Return(false));
 
-  TestTransportAvailabilityObserver observer;
+  TestObserver observer;
   auto request_handler = CreateFakeHandler();
   request_handler->set_observer(&observer);
 
@@ -622,7 +621,7 @@ TEST_F(FidoRequestHandlerTest,
        TransportAvailabilityNotificationOnObserverSetLate) {
   EXPECT_CALL(*adapter(), IsPresent()).WillOnce(::testing::Return(true));
 
-  TestTransportAvailabilityObserver observer;
+  TestObserver observer;
   auto request_handler = CreateFakeHandler();
   scoped_task_environment_.FastForwardUntilNoTasksRemain();
 
@@ -634,7 +633,7 @@ TEST_F(FidoRequestHandlerTest,
 
 TEST_F(FidoRequestHandlerTest, EmbedderNotifiedWhenAuthenticatorIdChanges) {
   static constexpr char kNewAuthenticatorId[] = "new_authenticator_id";
-  TestTransportAvailabilityObserver observer;
+  TestObserver observer;
   auto request_handler = CreateFakeHandler();
   request_handler->set_observer(&observer);
   ble_discovery()->WaitForCallToStartAndSimulateSuccess();
@@ -653,7 +652,7 @@ TEST_F(FidoRequestHandlerTest, TransportAvailabilityOfWindowsAuthenticator) {
   ScopedFakeWinWebAuthnApi scoped_fake_win_webauthn_api;
   scoped_fake_win_webauthn_api.set_available(true);
 
-  TestTransportAvailabilityObserver observer;
+  TestObserver observer;
   ForgeNextHidDiscovery();
   EmptyRequestHandler request_handler(
       {FidoTransportProtocol::kUsbHumanInterfaceDevice});