Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/test/base/view_event_test_platform_part.h" | 5 #include "chrome/test/base/view_event_test_platform_part.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "ash/common/material_design/material_design_controller.h" | 10 #include "ash/common/material_design/material_design_controller.h" |
| 11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 12 #include "ash/shell_init_params.h" | 12 #include "ash/shell_init_params.h" |
| 13 #include "ash/test/ash_test_helper.h" | 13 #include "ash/test/ash_test_helper.h" |
| 14 #include "ash/test/material_design_controller_test_api.h" | |
| 14 #include "ash/test/test_session_state_delegate.h" | 15 #include "ash/test/test_session_state_delegate.h" |
| 15 #include "ash/test/test_shell_delegate.h" | 16 #include "ash/test/test_shell_delegate.h" |
| 16 #include "base/command_line.h" | 17 #include "base/command_line.h" |
| 17 #include "base/macros.h" | 18 #include "base/macros.h" |
| 18 #include "chromeos/audio/cras_audio_handler.h" | 19 #include "chromeos/audio/cras_audio_handler.h" |
| 19 #include "chromeos/dbus/dbus_thread_manager.h" | 20 #include "chromeos/dbus/dbus_thread_manager.h" |
| 20 #include "chromeos/network/network_handler.h" | 21 #include "chromeos/network/network_handler.h" |
| 21 #include "content/public/browser/browser_thread.h" | 22 #include "content/public/browser/browser_thread.h" |
| 22 #include "device/bluetooth/dbus/bluez_dbus_manager.h" | 23 #include "device/bluetooth/dbus/bluez_dbus_manager.h" |
| 23 #include "ui/aura/env.h" | 24 #include "ui/aura/env.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 79 ash::Shell::DeleteInstance(); | 80 ash::Shell::DeleteInstance(); |
| 80 env_.reset(); | 81 env_.reset(); |
| 81 | 82 |
| 82 chromeos::NetworkHandler::Shutdown(); | 83 chromeos::NetworkHandler::Shutdown(); |
| 83 chromeos::CrasAudioHandler::Shutdown(); | 84 chromeos::CrasAudioHandler::Shutdown(); |
| 84 bluez::BluezDBusManager::Shutdown(); | 85 bluez::BluezDBusManager::Shutdown(); |
| 85 chromeos::DBusThreadManager::Shutdown(); | 86 chromeos::DBusThreadManager::Shutdown(); |
| 86 // Ash Shell can't just live on its own without a browser process, we need to | 87 // Ash Shell can't just live on its own without a browser process, we need to |
| 87 // also shut down the message center. | 88 // also shut down the message center. |
| 88 message_center::MessageCenter::Shutdown(); | 89 message_center::MessageCenter::Shutdown(); |
| 90 ash::test::MaterialDesignControllerTestAPI::Uninitialize(); | |
|
James Cook
2016/06/13 21:43:17
nit: Move this to line 82, so you uninitialize thi
yiyix
2016/06/14 05:55:27
Will commit this change in a different CL because
| |
| 89 } | 91 } |
| 90 | 92 |
| 91 } // namespace | 93 } // namespace |
| 92 | 94 |
| 93 // static | 95 // static |
| 94 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create( | 96 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create( |
| 95 ui::ContextFactory* context_factory) { | 97 ui::ContextFactory* context_factory) { |
| 96 return new ViewEventTestPlatformPartChromeOS(context_factory); | 98 return new ViewEventTestPlatformPartChromeOS(context_factory); |
| 97 } | 99 } |
| OLD | NEW |