Fix bluetooth adapter access in SystemTrayDelegateChromeOS.

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 <set>
@@ skipping 244 matching lines @@
 
   if (CrasAudioHandler::IsInitialized())
     CrasAudioHandler::Get()->AddAudioObserver(this);
 
   BrowserList::AddObserver(this);
 }
 
 void SystemTrayDelegateChromeOS::InitializeOnAdapterReady(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   bluetooth_adapter_ = adapter;
-  CHECK(bluetooth_adapter_.get());
+  CHECK(bluetooth_adapter_);
   bluetooth_adapter_->AddObserver(this);
 
   local_state_registrar_.reset(new PrefChangeRegistrar);
   local_state_registrar_->Init(g_browser_process->local_state());
 
   UpdateSessionStartTime();
   UpdateSessionLengthLimit();
 
   local_state_registrar_->Add(
       prefs::kSessionStartTime,
@@ skipping 21 matching lines @@
   // Unregister content notifications before destroying any components.
   registrar_.reset();
 
   // Unregister a11y status subscription.
   accessibility_subscription_.reset();
 
   g_browser_process->platform_part()->GetSystemClock()->RemoveObserver(this);
   DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(this);
   input_method::InputMethodManager::Get()->RemoveObserver(this);
   ui::ime::InputMethodMenuManager::GetInstance()->RemoveObserver(this);
-  bluetooth_adapter_->RemoveObserver(this);
+  if (bluetooth_adapter_)
+    bluetooth_adapter_->RemoveObserver(this);
   ash::WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(
       this);
 
   if (CrasAudioHandler::IsInitialized())
     CrasAudioHandler::Get()->RemoveAudioObserver(this);
 
   BrowserList::RemoveObserver(this);
   StopObservingAppWindowRegistry();
   StopObservingCustodianInfoChanges();
 
@@ skipping 354 matching lines @@
     ash::WmShell::Get()->RecordUserMetricsAction(
         ash::UMA_STATUS_AREA_BLUETOOTH_CONNECT_UNKNOWN_DEVICE);
     BluetoothPairingDialog* dialog =
         new BluetoothPairingDialog(GetNativeWindow(), device);
     // The dialog deletes itself on close.
     dialog->Show();
   }
 }
 
 bool SystemTrayDelegateChromeOS::IsBluetoothDiscovering() {
-  return bluetooth_adapter_->IsDiscovering();
+  return bluetooth_adapter_ && bluetooth_adapter_->IsDiscovering();
 }
 
 void SystemTrayDelegateChromeOS::GetCurrentIME(ash::IMEInfo* info) {
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
   input_method::InputMethodDescriptor ime =
       manager->GetActiveIMEState()->GetCurrentInputMethod();
   ExtractIMEInfo(ime, *util, info);
   info->selected = true;
@@ skipping 59 matching lines @@
 void SystemTrayDelegateChromeOS::ShowOtherNetworkDialog(
     const std::string& type) {
   if (type == shill::kTypeCellular) {
     ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow());
     return;
   }
   NetworkConfigView::ShowForType(type, GetNativeWindow());
 }
 
 bool SystemTrayDelegateChromeOS::GetBluetoothAvailable() {
-  return bluetooth_adapter_->IsPresent();
+  return bluetooth_adapter_ && bluetooth_adapter_->IsPresent();
 }
 
 bool SystemTrayDelegateChromeOS::GetBluetoothEnabled() {
-  return bluetooth_adapter_->IsPowered();
+  return bluetooth_adapter_ && bluetooth_adapter_->IsPowered();
 }
 
 bool SystemTrayDelegateChromeOS::GetBluetoothDiscovering() {
-  return (bluetooth_discovery_session_.get() &&
-      bluetooth_discovery_session_->IsActive());
+  return bluetooth_discovery_session_ &&
+         bluetooth_discovery_session_->IsActive();
 }
 
 void SystemTrayDelegateChromeOS::ChangeProxySettings() {
   CHECK(GetUserLoginStatus() == ash::LoginStatus::NOT_LOGGED_IN);
   LoginDisplayHost::default_host()->OpenProxySettings();
 }
 
 ash::CastConfigDelegate* SystemTrayDelegateChromeOS::GetCastConfigDelegate() {
   if (!cast_config_delegate_)
     cast_config_delegate_ = CreateCastConfigDelegate();
@@ skipping 551 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos