cros: Eliminate bluetooth methods from SystemTrayDelegate

chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc

 // Copyright 2014 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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <string>
 
 #include "ash/common/system/date/date_default_view.h"
 #include "ash/common/system/date/date_view.h"
 #include "ash/common/system/date/system_info_default_view.h"
 #include "ash/common/system/date/tray_date.h"
 #include "ash/common/system/date/tray_system_info.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/test/test_utils.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"

[msw, 2017/03/21 01:54:44]

nit: remove bluetooth includes and using statements.

[James Cook, 2017/03/21 04:43:01]

Done.

 #include "device/bluetooth/dbus/fake_bluetooth_adapter_client.h"
 
 using bluez::BluezDBusManager;
 using bluez::FakeBluetoothAdapterClient;
 
 namespace chromeos {
 
 namespace {
 
 // Because policy is not needed this test it is better to use e-mails that
@@ skipping 70 matching lines @@
   CreateDefaultView();
   EXPECT_EQ(base::k12HourClock, GetHourType());
 
   user_manager::UserManager::Get()->SwitchActiveUser(account_id1_);
   // Allow clock setting to be sent to ash over mojo.
   content::RunAllPendingInMessageLoop();
   CreateDefaultView();
   EXPECT_EQ(base::k24HourClock, GetHourType());
 }
 
-using SystemTrayDelegateBluetoothTest = InProcessBrowserTest;
-
-// Tests basic functionality of the Bluetooth interface.
-// TODO(jamescook): Delete this test when TrayBluetoothHelper moves to ash.
-// http://crbug.com/660043
-IN_PROC_BROWSER_TEST_F(SystemTrayDelegateBluetoothTest, Basics) {
-  // Set Bluetooth discovery simulation delay to 0 so the test doesn't have to
-  // wait or use timers.
-  FakeBluetoothAdapterClient* adapter_client =
-      static_cast<FakeBluetoothAdapterClient*>(
-          BluezDBusManager::Get()->GetBluetoothAdapterClient());
-  adapter_client->SetSimulationIntervalMs(0);
-
-  ash::SystemTrayDelegate* delegate =
-      ash::WmShell::Get()->system_tray_delegate();
-  EXPECT_TRUE(delegate->GetBluetoothAvailable());
-  EXPECT_FALSE(delegate->GetBluetoothEnabled());
-  EXPECT_FALSE(delegate->GetBluetoothDiscovering());
-  EXPECT_FALSE(delegate->IsBluetoothDiscovering());
-
-  ash::BluetoothDeviceList devices;
-  delegate->GetAvailableBluetoothDevices(&devices);
-  // The devices are fake in tests, so don't assume any particular number.
-  EXPECT_FALSE(devices.empty());
-
-  // Turn Bluetooth on.
-  delegate->ToggleBluetooth();
-  content::RunAllPendingInMessageLoop();
-  EXPECT_TRUE(delegate->GetBluetoothEnabled());
-
-  delegate->BluetoothStartDiscovering();
-  content::RunAllPendingInMessageLoop();
-  EXPECT_TRUE(delegate->GetBluetoothDiscovering());
-  EXPECT_TRUE(delegate->IsBluetoothDiscovering());
-
-  delegate->BluetoothStopDiscovering();
-  content::RunAllPendingInMessageLoop();
-  EXPECT_FALSE(delegate->GetBluetoothDiscovering());
-  EXPECT_FALSE(delegate->IsBluetoothDiscovering());
-
-  // Turn Bluetooth off.
-  delegate->ToggleBluetooth();
-  content::RunAllPendingInMessageLoop();
-  EXPECT_FALSE(delegate->GetBluetoothEnabled());
-}
-
 }  // namespace chromeos