Move more from WmShell to Shell

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"
@@ skipping 112 matching lines @@
 // 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();
+  ash::SystemTrayDelegate* delegate = ash::Shell::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());
 
@@ skipping 12 matching lines @@
   EXPECT_FALSE(delegate->GetBluetoothDiscovering());
   EXPECT_FALSE(delegate->IsBluetoothDiscovering());
 
   // Turn Bluetooth off.
   delegate->ToggleBluetooth();
   content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(delegate->GetBluetoothEnabled());
 }
 
 }  // namespace chromeos