chromeos: Fix crash when clicking on networking menu under mash

ash/mus/window_manager_application.cc

 // Copyright 2015 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 "ash/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/mojo_interface_factory.h"
 #include "ash/mus/network_connect_delegate_mus.h"
@@ skipping 77 matching lines @@
   statistics_provider_->SetMachineStatistic("keyboard_layout", "");
 
   window_manager_->Init(std::move(window_tree_client), blocking_pool,
                         std::move(shell_delegate_));
 }
 
 void WindowManagerApplication::InitializeComponents(bool init_network_handler) {
   message_center::MessageCenter::Initialize();
 
   // Must occur after mojo::ApplicationRunner has initialized AtExitManager, but
-  // before WindowManager::Init().
-  chromeos::DBusThreadManager::Initialize(
-      chromeos::DBusThreadManager::PROCESS_ASH);
+  // before WindowManager::Init(). Tests might initialize their own instance.
+  if (!chromeos::DBusThreadManager::IsInitialized()) {
+    chromeos::DBusThreadManager::Initialize(
+        chromeos::DBusThreadManager::PROCESS_ASH);
+    dbus_thread_manager_initialized_ = true;
+  }
 
   // See ChromeBrowserMainPartsChromeos for ordering details.
   bluez::BluezDBusManager::Initialize(
       chromeos::DBusThreadManager::Get()->GetSystemBus(),
       chromeos::DBusThreadManager::Get()->IsUsingFakes());
-  if (init_network_handler)
+  if (init_network_handler) {
     chromeos::NetworkHandler::Initialize();

[stevenjb, 2017/05/03 22:11:39]

Should we also check chromeos::NetworkHandler::IsInitialized() here just for
robustness?

[James Cook, 2017/05/03 22:29:32]

Done.

+    network_handler_initialized_ = true;
+  }
   network_connect_delegate_.reset(new NetworkConnectDelegateMus());
   chromeos::NetworkConnect::Initialize(network_connect_delegate_.get());
   // TODO(jamescook): Initialize real audio handler.
   chromeos::CrasAudioHandler::InitializeForTesting();
 }
 
 void WindowManagerApplication::ShutdownComponents() {
   // NOTE: PowerStatus is shutdown by Shell.
   chromeos::CrasAudioHandler::Shutdown();
   chromeos::NetworkConnect::Shutdown();
   network_connect_delegate_.reset();
   // We may not have started the NetworkHandler.
-  if (chromeos::NetworkHandler::IsInitialized())
+  if (network_handler_initialized_)
     chromeos::NetworkHandler::Shutdown();
   device::BluetoothAdapterFactory::Shutdown();
   bluez::BluezDBusManager::Shutdown();
-  chromeos::DBusThreadManager::Shutdown();
+  if (dbus_thread_manager_initialized_)
+    chromeos::DBusThreadManager::Shutdown();
   message_center::MessageCenter::Shutdown();
 }
 
 void WindowManagerApplication::OnStart() {
   mojo_interface_factory::RegisterInterfaces(
       &registry_, base::ThreadTaskRunnerHandle::Get());
 
   aura_init_ = base::MakeUnique<views::AuraInit>(
       context()->connector(), context()->identity(), "ash_mus_resources.pak",
       "ash_mus_resources_200.pak", nullptr,
@@ skipping 21 matching lines @@
 void WindowManagerApplication::OnBindInterface(
     const service_manager::BindSourceInfo& source_info,
     const std::string& interface_name,
     mojo::ScopedMessagePipeHandle interface_pipe) {
   registry_.BindInterface(source_info, interface_name,
                           std::move(interface_pipe));
 }
 
 }  // namespace mus
 }  // namespace ash