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

Side by Side Diff: ash/mus/app_launch_unittest.cc

Issue 2710673002: Add Mojo constant for "ash" and replace hardcoded strings (Closed)
Patch Set: s/USE_ASH/OS_CHROMEOS/ Created 3 years, 10 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
« no previous file with comments | « no previous file | ash/mus/window_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/public/interfaces/constants.mojom.h"
5 #include "base/bind.h" 6 #include "base/bind.h"
6 #include "base/command_line.h" 7 #include "base/command_line.h"
7 #include "base/run_loop.h" 8 #include "base/run_loop.h"
8 #include "mash/quick_launch/public/interfaces/constants.mojom.h" 9 #include "mash/quick_launch/public/interfaces/constants.mojom.h"
9 #include "services/service_manager/public/cpp/service_test.h" 10 #include "services/service_manager/public/cpp/service_test.h"
10 #include "services/ui/public/interfaces/constants.mojom.h" 11 #include "services/ui/public/interfaces/constants.mojom.h"
11 #include "services/ui/public/interfaces/window_server_test.mojom.h" 12 #include "services/ui/public/interfaces/window_server_test.mojom.h"
12 13
13 namespace ash { 14 namespace ash {
14 namespace mus { 15 namespace mus {
(...skipping 11 matching lines...) Expand all
26 private: 27 private:
27 void SetUp() override { 28 void SetUp() override {
28 base::CommandLine::ForCurrentProcess()->AppendSwitch("use-test-config"); 29 base::CommandLine::ForCurrentProcess()->AppendSwitch("use-test-config");
29 ServiceTest::SetUp(); 30 ServiceTest::SetUp();
30 } 31 }
31 32
32 DISALLOW_COPY_AND_ASSIGN(AppLaunchTest); 33 DISALLOW_COPY_AND_ASSIGN(AppLaunchTest);
33 }; 34 };
34 35
35 TEST_F(AppLaunchTest, TestQuickLaunch) { 36 TEST_F(AppLaunchTest, TestQuickLaunch) {
36 connector()->Connect("ash"); 37 connector()->Connect(mojom::kServiceName);
37 connector()->Connect(mash::quick_launch::mojom::kServiceName); 38 connector()->Connect(mash::quick_launch::mojom::kServiceName);
38 39
39 ui::mojom::WindowServerTestPtr test_interface; 40 ui::mojom::WindowServerTestPtr test_interface;
40 connector()->BindInterface(ui::mojom::kServiceName, &test_interface); 41 connector()->BindInterface(ui::mojom::kServiceName, &test_interface);
41 42
42 base::RunLoop run_loop; 43 base::RunLoop run_loop;
43 bool success = false; 44 bool success = false;
44 test_interface->EnsureClientHasDrawnWindow( 45 test_interface->EnsureClientHasDrawnWindow(
45 mash::quick_launch::mojom::kServiceName, 46 mash::quick_launch::mojom::kServiceName,
46 base::Bind(&RunCallback, &success, run_loop.QuitClosure())); 47 base::Bind(&RunCallback, &success, run_loop.QuitClosure()));
47 run_loop.Run(); 48 run_loop.Run();
48 EXPECT_TRUE(success); 49 EXPECT_TRUE(success);
49 } 50 }
50 51
51 } // namespace mus 52 } // namespace mus
52 } // namespace ash 53 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/mus/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698