Update UsbChooserController unit test

chrome/browser/usb/usb_chooser_controller_unittest.cc

Index: chrome/browser/usb/usb_chooser_controller_unittest.cc
diff --git a/chrome/browser/usb/usb_chooser_controller_unittest.cc b/chrome/browser/usb/usb_chooser_controller_unittest.cc
index 3a4134215f3f25c27a66d57cfaedef7ab01ea8e5..4f32382237e2fdbc500b5d0524de85a9630cb5a4 100644
--- a/chrome/browser/usb/usb_chooser_controller_unittest.cc
+++ b/chrome/browser/usb/usb_chooser_controller_unittest.cc
@@ -15,6 +15,7 @@
 #include "device/usb/mock_usb_service.h"
 #include "device/usb/public/interfaces/device_manager.mojom.h"
 #include "mojo/public/cpp/bindings/array.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
@@ -22,12 +23,27 @@ namespace {
 
 const char kDefaultTestUrl[] = "https://www.google.com/";
 
+class MockUsbChooserView : public ChooserController::View {
+ public:
+  MockUsbChooserView() {}
+
+  // ChooserController::View:
+  MOCK_METHOD1(OnOptionAdded, void(size_t index));
+  MOCK_METHOD1(OnOptionRemoved, void(size_t index));
+  void OnOptionsInitialized() override {}
+  void OnOptionUpdated(size_t index) override {}
+  void OnAdapterEnabledChanged(bool enabled) override {}
+  void OnRefreshStateChanged(bool enabled) {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockUsbChooserView);
+};
+
 }  //  namespace
 
 class UsbChooserControllerTest : public ChromeRenderViewHostTestHarness {
  public:
   UsbChooserControllerTest() {}
-  ~UsbChooserControllerTest() override = default;
 
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
@@ -39,6 +55,8 @@ class UsbChooserControllerTest : public ChromeRenderViewHostTestHarness {
     web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl));
     usb_chooser_controller_.reset(new UsbChooserController(
         main_rfh(), std::move(device_filters), main_rfh(), callback));
+    mock_usb_chooser_view_.reset(new MockUsbChooserView());
+    usb_chooser_controller_->set_view(mock_usb_chooser_view_.get());
   }
 
  protected:
@@ -56,6 +74,7 @@ class UsbChooserControllerTest : public ChromeRenderViewHostTestHarness {
 
   device::MockDeviceClient device_client_;
   std::unique_ptr<UsbChooserController> usb_chooser_controller_;
+  std::unique_ptr<MockUsbChooserView> mock_usb_chooser_view_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UsbChooserControllerTest);
@@ -64,18 +83,21 @@ class UsbChooserControllerTest : public ChromeRenderViewHostTestHarness {
 TEST_F(UsbChooserControllerTest, AddDevice) {
   scoped_refptr<device::MockUsbDevice> device_a =
       CreateMockUsbDevice("a", "001");
+  EXPECT_CALL(*mock_usb_chooser_view_, OnOptionAdded(0)).Times(1);
   device_client_.usb_service()->AddDevice(device_a);
   EXPECT_EQ(1u, usb_chooser_controller_->NumOptions());
   EXPECT_EQ(base::ASCIIToUTF16("a"), usb_chooser_controller_->GetOption(0));
 
   scoped_refptr<device::MockUsbDevice> device_b =
       CreateMockUsbDevice("b", "002");
+  EXPECT_CALL(*mock_usb_chooser_view_, OnOptionAdded(1)).Times(1);
   device_client_.usb_service()->AddDevice(device_b);
   EXPECT_EQ(2u, usb_chooser_controller_->NumOptions());
   EXPECT_EQ(base::ASCIIToUTF16("b"), usb_chooser_controller_->GetOption(1));
 
   scoped_refptr<device::MockUsbDevice> device_c =
       CreateMockUsbDevice("c", "003");
+  EXPECT_CALL(*mock_usb_chooser_view_, OnOptionAdded(2)).Times(1);
   device_client_.usb_service()->AddDevice(device_c);
   EXPECT_EQ(3u, usb_chooser_controller_->NumOptions());
   EXPECT_EQ(base::ASCIIToUTF16("c"), usb_chooser_controller_->GetOption(2));
@@ -92,6 +114,7 @@ TEST_F(UsbChooserControllerTest, RemoveDevice) {
       CreateMockUsbDevice("c", "003");
   device_client_.usb_service()->AddDevice(device_c);
 
+  EXPECT_CALL(*mock_usb_chooser_view_, OnOptionRemoved(1)).Times(1);
   device_client_.usb_service()->RemoveDevice(device_b);
   EXPECT_EQ(2u, usb_chooser_controller_->NumOptions());
   EXPECT_EQ(base::ASCIIToUTF16("a"), usb_chooser_controller_->GetOption(0));
@@ -105,10 +128,12 @@ TEST_F(UsbChooserControllerTest, RemoveDevice) {
   EXPECT_EQ(base::ASCIIToUTF16("a"), usb_chooser_controller_->GetOption(0));
   EXPECT_EQ(base::ASCIIToUTF16("c"), usb_chooser_controller_->GetOption(1));
 
+  EXPECT_CALL(*mock_usb_chooser_view_, OnOptionRemoved(0)).Times(1);
   device_client_.usb_service()->RemoveDevice(device_a);
   EXPECT_EQ(1u, usb_chooser_controller_->NumOptions());
   EXPECT_EQ(base::ASCIIToUTF16("c"), usb_chooser_controller_->GetOption(0));
 
+  EXPECT_CALL(*mock_usb_chooser_view_, OnOptionRemoved(0)).Times(1);
   device_client_.usb_service()->RemoveDevice(device_c);
   EXPECT_EQ(0u, usb_chooser_controller_->NumOptions());
 }