Remove DeviceMonitorLinux::WillDestroyCurrentMessageLoop().

chrome/browser/chromeos/login/bluetooth_host_pairing_browsertest.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 "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "components/pairing/bluetooth_host_pairing_controller.h"
 #include "components/pairing/shark_connection_listener.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/hid/fake_input_service_linux.h"
 
@@ skipping 32 matching lines @@
 
 // This is the class to simulate the OOBE process for devices that don't have
 // sufficient input, i.e., the first screen of OOBE is the HID detection screen.
 // The device will put itself in Bluetooth discoverable mode.
 class BluetoothHostPairingNoInputTest : public OobeBaseTest {
  public:
   using InputDeviceInfo = device::InputServiceLinux::InputDeviceInfo;
 
   BluetoothHostPairingNoInputTest() {
     InputServiceProxy::SetThreadIdForTesting(content::BrowserThread::UI);
-    input_service_linux_.reset(new device::FakeInputServiceLinux);
-    device::InputServiceLinux::SetForTesting(input_service_linux_.get());
+    device::InputServiceLinux::SetForTesting(
+        base::MakeUnique<device::FakeInputServiceLinux>());
   }
   ~BluetoothHostPairingNoInputTest() override {}
 
   // OobeBaseTest override:
   void SetUpOnMainThread() override {
     OobeBaseTest::SetUpOnMainThread();
     delegate_.reset(new TestDelegate);
     if (controller()) {
       controller()->SetDelegateForTesting(delegate_.get());
       bluetooth_adapter_ = controller()->GetAdapterForTesting();
@@ skipping 12 matching lines @@
   }
 
   TestDelegate* delegate() { return delegate_.get(); }
 
   void AddUsbMouse() {
     InputDeviceInfo mouse;
     mouse.id = "usb_mouse";
     mouse.subsystem = InputDeviceInfo::SUBSYSTEM_INPUT;
     mouse.type = InputDeviceInfo::TYPE_USB;
     mouse.is_mouse = true;
-    input_service_linux_->AddDeviceForTesting(mouse);
+    static_cast<device::FakeInputServiceLinux*>(

[achuithb, 2016/11/10 23:24:00]

Could you pull this out into a helper like
void AddDeviceForTesting(...)

[fdoray, 2016/11/11 14:21:45]

Done.

+        device::InputServiceLinux::GetInstance())
+        ->AddDeviceForTesting(mouse);
   }
 
   void AddUsbKeyboard() {
     InputDeviceInfo keyboard;
     keyboard.id = "usb_keyboard";
     keyboard.subsystem = InputDeviceInfo::SUBSYSTEM_INPUT;
     keyboard.type = InputDeviceInfo::TYPE_USB;
     keyboard.is_keyboard = true;
-    input_service_linux_->AddDeviceForTesting(keyboard);
+    static_cast<device::FakeInputServiceLinux*>(
+        device::InputServiceLinux::GetInstance())
+        ->AddDeviceForTesting(keyboard);
   }
 
   void AddBluetoothMouse() {
     InputDeviceInfo mouse;
     mouse.id = "bluetooth_mouse";
     mouse.subsystem = InputDeviceInfo::SUBSYSTEM_INPUT;
     mouse.type = InputDeviceInfo::TYPE_BLUETOOTH;
     mouse.is_mouse = true;
-    input_service_linux_->AddDeviceForTesting(mouse);
+    static_cast<device::FakeInputServiceLinux*>(
+        device::InputServiceLinux::GetInstance())
+        ->AddDeviceForTesting(mouse);
   }
 
  private:
-  std::unique_ptr<device::FakeInputServiceLinux> input_service_linux_;
   scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
   std::unique_ptr<TestDelegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothHostPairingNoInputTest);
 };
 
 // Test that in normal user OOBE login flow for devices lacking input devices,
 // if there is no Bluetooth device connected, the Bluetooth adapter should be
 // disabled when OOBE reaches login screen (which means OOBE has been completed)
 IN_PROC_BROWSER_TEST_F(BluetoothHostPairingNoInputTest,
@@ skipping 42 matching lines @@
 // Test that in normal user OOBE login flow for devices that have input devices,
 // the Bluetooth is disabled by default.
 IN_PROC_BROWSER_TEST_F(BluetoothHostPairingWithInputTest,
                        BluetoothDisableByDefault) {
   OobeScreenWaiter(OobeScreen::SCREEN_OOBE_NETWORK).Wait();
   EXPECT_FALSE(controller());
   EXPECT_FALSE(bluetooth_adapter());
 }
 
 }  // namespace chromeos