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

Side by Side Diff: services/ui/demo/mus_demo_unittests.cc

Issue 2390013002: Rename mojo: to service: (Closed)
Patch Set: . Created 4 years, 2 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 | « services/ui/demo/manifest.json ('k') | services/ui/demo/test_manifest.json » ('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/macros.h" 7 #include "base/macros.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "services/shell/public/cpp/service_test.h" 9 #include "services/shell/public/cpp/service_test.h"
10 #include "services/ui/public/interfaces/window_server_test.mojom.h" 10 #include "services/ui/public/interfaces/window_server_test.mojom.h"
(...skipping 21 matching lines...) Expand all
32 ServiceTest::SetUp(); 32 ServiceTest::SetUp();
33 } 33 }
34 34
35 private: 35 private:
36 DISALLOW_COPY_AND_ASSIGN(MusDemoTest); 36 DISALLOW_COPY_AND_ASSIGN(MusDemoTest);
37 }; 37 };
38 38
39 } // namespace 39 } // namespace
40 40
41 TEST_F(MusDemoTest, CheckMusDemoDraws) { 41 TEST_F(MusDemoTest, CheckMusDemoDraws) {
42 connector()->Connect("mojo:mus_demo"); 42 connector()->Connect("service:mus_demo");
43 43
44 ::ui::mojom::WindowServerTestPtr test_interface; 44 ::ui::mojom::WindowServerTestPtr test_interface;
45 connector()->ConnectToInterface("mojo:ui", &test_interface); 45 connector()->ConnectToInterface("service:ui", &test_interface);
46 46
47 base::RunLoop run_loop; 47 base::RunLoop run_loop;
48 bool success = false; 48 bool success = false;
49 // TODO(kylechar): Fix WindowServer::CreateTreeForWindowManager so that the 49 // TODO(kylechar): Fix WindowServer::CreateTreeForWindowManager so that the
50 // WindowTree has the correct name instead of an empty name. 50 // WindowTree has the correct name instead of an empty name.
51 test_interface->EnsureClientHasDrawnWindow( 51 test_interface->EnsureClientHasDrawnWindow(
52 "", // WindowTree name is empty. 52 "", // WindowTree name is empty.
53 base::Bind(&RunCallback, &success, run_loop.QuitClosure())); 53 base::Bind(&RunCallback, &success, run_loop.QuitClosure()));
54 run_loop.Run(); 54 run_loop.Run();
55 EXPECT_TRUE(success); 55 EXPECT_TRUE(success);
56 } 56 }
57 57
58 } // namespace demo 58 } // namespace demo
59 } // namespace ui 59 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/demo/manifest.json ('k') | services/ui/demo/test_manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698