cros: Init SystemTrayDelegate earlier to break bluetooth init dependency

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 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 <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 106 matching lines @@
   UserAddingScreen::Get()->Start();
 }
 
 bool IsSessionInSecondaryLoginScreen() {
   return session_manager::SessionManager::Get()->IsInSecondaryLoginScreen();
 }
 
 }  // namespace
 
 SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
-    : bluetooth_helper_(base::MakeUnique<TrayBluetoothHelper>(this)),
+    : bluetooth_helper_(base::MakeUnique<TrayBluetoothHelper>()),
       networking_config_delegate_(
           base::MakeUnique<NetworkingConfigDelegateChromeos>()) {
   // Register notifications on construction so that events such as
   // PROFILE_CREATED do not get missed if they happen before Initialize().
   registrar_.reset(new content::NotificationRegistrar);
   if (GetUserLoginStatus() == ash::LoginStatus::NOT_LOGGED_IN) {
     registrar_->Add(this,
                     chrome::NOTIFICATION_SESSION_STARTED,
                     content::NotificationService::AllSources());
   }
@@ skipping 17 matching lines @@
 void SystemTrayDelegateChromeOS::Initialize() {
   DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
 
   input_method::InputMethodManager::Get()->AddObserver(this);
   input_method::InputMethodManager::Get()->AddImeMenuObserver(this);
   ui::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
 
   bluetooth_helper_->Initialize();
 
   BrowserList::AddObserver(this);
-}
 
-void SystemTrayDelegateChromeOS::InitializeOnAdapterReady() {
   local_state_registrar_.reset(new PrefChangeRegistrar);
   local_state_registrar_->Init(g_browser_process->local_state());
 
   UpdateSessionStartTime();
   UpdateSessionLengthLimit();
 
   local_state_registrar_->Add(
       prefs::kSessionStartTime,
       base::Bind(&SystemTrayDelegateChromeOS::UpdateSessionStartTime,
                  base::Unretained(this)));
@@ skipping 666 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos