Makes AshTestHelper shutdown ChromeOS NetworkHandler

ash/test/ash_test_helper.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 "ash/test/ash_test_helper.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/system/chromeos/screen_layout_observer.h"
 #include "ash/test/ash_test_environment.h"
 #include "ash/test/ash_test_views_delegate.h"
 #include "ash/test/display_configuration_controller_test_api.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/network/network_handler.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/input_state_lookup.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/test/env_test_helper.h"
 #include "ui/aura/test/event_generator_delegate_aura.h"
 #include "ui/aura/test/mus/window_tree_client_private.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 253 matching lines @@
 
   window_tree_client_setup_.InitForWindowManager(
       window_manager_app_->window_manager_.get(),
       window_manager_app_->window_manager_.get());
   aura::test::EnvTestHelper().SetWindowTreeClient(
       window_tree_client_setup_.window_tree_client());
   window_manager_app_->InitWindowManager(
       window_tree_client_setup_.OwnWindowTreeClient(),
       ash_test_environment_->GetBlockingPool());
 
+  // WindowManagerApplication starts the NetworkHandler. The NetworkHandler may
+  // cause subtle side effects (such as additional tray items) and tests expect
+  // it not to be running, so shut it down.
+  chromeos::NetworkHandler::Shutdown();

[James Cook, 2017/03/22 22:27:22]

Rather than doing this, how about passing a "for_test" boolean to
WindowManagerApplication and skipping the initialization?

+
   aura::WindowTreeClient* window_tree_client =
       window_manager_app_->window_manager()->window_tree_client();
   window_tree_client_private_ =
       base::MakeUnique<aura::WindowTreeClientPrivate>(window_tree_client);
   int next_x = 0;
   CreateRootWindowController("800x600", &next_x);
+
+  // Make sure the NetworkHandler didn't get turned on, see above comment as to
+  // why the NetworkHandler should not be running.
+  CHECK(!chromeos::NetworkHandler::IsInitialized());
 }
 
 void AshTestHelper::CreateShell() {
   CHECK(!IsMash());
   ui::ContextFactory* context_factory = nullptr;
   ui::ContextFactoryPrivate* context_factory_private = nullptr;
   bool enable_pixel_output = false;
   ui::InitializeContextFactoryForTests(enable_pixel_output, &context_factory,
                                        &context_factory_private);
   ShellInitParams init_params;
@@ skipping 51 matching lines @@
   std::set<RootWindowController*> roots =
       window_manager_app_->window_manager()->GetRootWindowControllers();
   std::vector<RootWindowController*> ordered_roots;
   ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end());
   std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId);
   return ordered_roots;
 }
 
 }  // namespace test
 }  // namespace ash