Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Side by Side Diff: chrome/test/base/view_event_test_platform_part_chromeos.cc

Issue 2319783002: mash: Allow a subset of D-Bus clients to be created in DBusThreadManager (Closed)
Patch Set: cleanup Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/common/ash_switches.h" 9 #include "ash/common/ash_switches.h"
10 #include "ash/common/material_design/material_design_controller.h" 10 #include "ash/common/material_design/material_design_controller.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 }; 47 };
48 48
49 ViewEventTestPlatformPartChromeOS::ViewEventTestPlatformPartChromeOS( 49 ViewEventTestPlatformPartChromeOS::ViewEventTestPlatformPartChromeOS(
50 ui::ContextFactory* context_factory) { 50 ui::ContextFactory* context_factory) {
51 // Ash Shell can't just live on its own without a browser process, we need to 51 // Ash Shell can't just live on its own without a browser process, we need to
52 // also create the message center. 52 // also create the message center.
53 message_center::MessageCenter::Initialize(); 53 message_center::MessageCenter::Initialize();
54 chromeos::DBusThreadManager::Initialize(); 54 chromeos::DBusThreadManager::Initialize();
55 bluez::BluezDBusManager::Initialize( 55 bluez::BluezDBusManager::Initialize(
56 chromeos::DBusThreadManager::Get()->GetSystemBus(), 56 chromeos::DBusThreadManager::Get()->GetSystemBus(),
57 chromeos::DBusThreadManager::Get()->IsUsingStub( 57 chromeos::DBusThreadManager::Get()->IsUsingFake(
58 chromeos::DBusClientBundle::BLUETOOTH)); 58 chromeos::DBusClientBundle::BLUETOOTH));
59 chromeos::CrasAudioHandler::InitializeForTesting(); 59 chromeos::CrasAudioHandler::InitializeForTesting();
60 chromeos::NetworkHandler::Initialize(); 60 chromeos::NetworkHandler::Initialize();
61 ash::MaterialDesignController::Initialize(); 61 ash::MaterialDesignController::Initialize();
62 62
63 env_ = aura::Env::CreateInstance(); 63 env_ = aura::Env::CreateInstance();
64 ash::test::TestShellDelegate* shell_delegate = 64 ash::test::TestShellDelegate* shell_delegate =
65 new ash::test::TestShellDelegate(); 65 new ash::test::TestShellDelegate();
66 ash::ShellInitParams init_params; 66 ash::ShellInitParams init_params;
67 init_params.delegate = shell_delegate; 67 init_params.delegate = shell_delegate;
(...skipping 20 matching lines...) Expand all
88 message_center::MessageCenter::Shutdown(); 88 message_center::MessageCenter::Shutdown();
89 } 89 }
90 90
91 } // namespace 91 } // namespace
92 92
93 // static 93 // static
94 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create( 94 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create(
95 ui::ContextFactory* context_factory) { 95 ui::ContextFactory* context_factory) {
96 return new ViewEventTestPlatformPartChromeOS(context_factory); 96 return new ViewEventTestPlatformPartChromeOS(context_factory);
97 } 97 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698