cros: Init SystemTrayDelegate earlier to break bluetooth init dependency

chrome/browser/ui/ash/tray_bluetooth_helper.cc

 // Copyright 2017 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/tray_bluetooth_helper.h"
 
+#include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/user_metrics.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
-#include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 
 using chromeos::BluetoothPairingDialog;
 
 namespace {
 
 void BluetoothSetDiscoveringError() {
   LOG(ERROR) << "BluetoothSetDiscovering failed.";
 }
 
 void BluetoothDeviceConnectError(
     device::BluetoothDevice::ConnectErrorCode error_code) {}
 
 ash::SystemTrayNotifier* GetSystemTrayNotifier() {
   return ash::WmShell::Get()->system_tray_notifier();
 }
 
 }  // namespace
 
-TrayBluetoothHelper::TrayBluetoothHelper(
-    chromeos::SystemTrayDelegateChromeOS* system_tray_delegate)
-    : system_tray_delegate_(system_tray_delegate), weak_ptr_factory_(this) {}
+TrayBluetoothHelper::TrayBluetoothHelper() : weak_ptr_factory_(this) {}
 
 TrayBluetoothHelper::~TrayBluetoothHelper() {
   if (adapter_)
     adapter_->RemoveObserver(this);
 }
 
 void TrayBluetoothHelper::Initialize() {
   device::BluetoothAdapterFactory::GetAdapter(
       base::Bind(&TrayBluetoothHelper::InitializeOnAdapterReady,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void TrayBluetoothHelper::InitializeOnAdapterReady(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   adapter_ = adapter;
   CHECK(adapter_);
   adapter_->AddObserver(this);
-
-  // May be null in tests.
-  if (system_tray_delegate_)
-    system_tray_delegate_->InitializeOnAdapterReady();
 }
 
 void TrayBluetoothHelper::GetAvailableDevices(
     std::vector<ash::BluetoothDeviceInfo>* list) {
   device::BluetoothAdapter::DeviceList devices = adapter_->GetDevices();
   for (device::BluetoothDevice* device : devices) {
     ash::BluetoothDeviceInfo info;
     info.address = device->GetAddress();
     info.display_name = device->GetNameForDisplay();
     info.connected = device->IsConnected();
@@ skipping 113 matching lines @@
     std::unique_ptr<device::BluetoothDiscoverySession> discovery_session) {
   // If the discovery session was returned after a request to stop discovery
   // (e.g. the user dismissed the Bluetooth detailed view before the call
   // returned), don't claim the discovery session and let it clean up.
   if (!should_run_discovery_)
     return;
   VLOG(1) << "Claiming new Bluetooth device discovery session.";
   discovery_session_ = std::move(discovery_session);
   GetSystemTrayNotifier()->NotifyBluetoothDiscoveringChanged();
 }