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

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

Issue 2029883002: Moves mash/wm into ash/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_static_assert
Patch Set: move comment Created 4 years, 6 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 | « ash/mus/accelerator_registrar_unittest.cc ('k') | ash/mus/background_layout.h » ('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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "components/mus/public/interfaces/window_server_test.mojom.h" 8 #include "components/mus/public/interfaces/window_server_test.mojom.h"
9 #include "services/shell/public/cpp/shell_test.h" 9 #include "services/shell/public/cpp/shell_test.h"
10 10
11 namespace mash { 11 namespace ash {
12 namespace wm { 12 namespace mus {
13 13
14 void RunCallback(bool* success, const base::Closure& callback, bool result) { 14 void RunCallback(bool* success, const base::Closure& callback, bool result) {
15 *success = result; 15 *success = result;
16 callback.Run(); 16 callback.Run();
17 } 17 }
18 18
19 class AppLaunchTest : public shell::test::ShellTest { 19 class AppLaunchTest : public shell::test::ShellTest {
20 public: 20 public:
21 AppLaunchTest() : ShellTest("exe:mash_unittests") {} 21 AppLaunchTest() : ShellTest("exe:mash_unittests") {}
22 ~AppLaunchTest() override {} 22 ~AppLaunchTest() override {}
23 23
24 private: 24 private:
25 void SetUp() override { 25 void SetUp() override {
26 base::CommandLine::ForCurrentProcess()->AppendSwitch("use-test-config"); 26 base::CommandLine::ForCurrentProcess()->AppendSwitch("use-test-config");
27 ShellTest::SetUp(); 27 ShellTest::SetUp();
28 } 28 }
29 29
30 DISALLOW_COPY_AND_ASSIGN(AppLaunchTest); 30 DISALLOW_COPY_AND_ASSIGN(AppLaunchTest);
31 }; 31 };
32 32
33 TEST_F(AppLaunchTest, TestQuickLaunch) { 33 TEST_F(AppLaunchTest, TestQuickLaunch) {
34 connector()->Connect("mojo:desktop_wm"); 34 connector()->Connect("mojo:desktop_wm");
35 connector()->Connect("mojo:quick_launch"); 35 connector()->Connect("mojo:quick_launch");
36 36
37 mus::mojom::WindowServerTestPtr test_interface; 37 ::mus::mojom::WindowServerTestPtr test_interface;
38 connector()->ConnectToInterface("mojo:mus", &test_interface); 38 connector()->ConnectToInterface("mojo:mus", &test_interface);
39 39
40 base::RunLoop run_loop; 40 base::RunLoop run_loop;
41 bool success = false; 41 bool success = false;
42 test_interface->EnsureClientHasDrawnWindow( 42 test_interface->EnsureClientHasDrawnWindow(
43 "mojo:quick_launch", 43 "mojo:quick_launch",
44 base::Bind(&RunCallback, &success, run_loop.QuitClosure())); 44 base::Bind(&RunCallback, &success, run_loop.QuitClosure()));
45 run_loop.Run(); 45 run_loop.Run();
46 EXPECT_TRUE(success); 46 EXPECT_TRUE(success);
47 } 47 }
48 48
49 } // namespace wm 49 } // namespace mus
50 } // namespace mash 50 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/accelerator_registrar_unittest.cc ('k') | ash/mus/background_layout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698