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

Side by Side Diff: services/service_manager/tests/connect/connect_unittest.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase 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
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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/guid.h" 12 #include "base/guid.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/run_loop.h" 14 #include "base/run_loop.h"
15 #include "base/test/test_suite.h" 15 #include "base/test/test_suite.h"
16 #include "mojo/public/cpp/bindings/binding_set.h" 16 #include "mojo/public/cpp/bindings/binding_set.h"
17 #include "services/shell/public/cpp/names.h" 17 #include "services/service_manager/public/cpp/names.h"
18 #include "services/shell/public/cpp/service_test.h" 18 #include "services/service_manager/public/cpp/service_test.h"
19 #include "services/shell/public/interfaces/service_manager.mojom.h" 19 #include "services/service_manager/public/interfaces/service_manager.mojom.h"
20 #include "services/shell/tests/connect/connect_test.mojom.h" 20 #include "services/service_manager/tests/connect/connect_test.mojom.h"
21 21
22 // Tests that multiple services can be packaged in a single service by 22 // Tests that multiple services can be packaged in a single service by
23 // implementing ServiceFactory; that these services can be specified by 23 // implementing ServiceFactory; that these services can be specified by
24 // the package's manifest and are thus registered with the PackageManager. 24 // the package's manifest and are thus registered with the PackageManager.
25 25
26 namespace shell { 26 namespace shell {
27 27
28 namespace { 28 namespace {
29 29
30 const char kTestPackageName[] = "service:connect_test_package"; 30 const char kTestPackageName[] = "service:connect_test_package";
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 base::RunLoop loop; 406 base::RunLoop loop;
407 inherit_connection->AddConnectionCompletedClosure( 407 inherit_connection->AddConnectionCompletedClosure(
408 base::Bind(&QuitLoop, &loop)); 408 base::Bind(&QuitLoop, &loop));
409 loop.Run(); 409 loop.Run();
410 EXPECT_EQ(inherit_connection->GetRemoteIdentity().user_id(), 410 EXPECT_EQ(inherit_connection->GetRemoteIdentity().user_id(),
411 connection->GetRemoteIdentity().user_id()); 411 connection->GetRemoteIdentity().user_id());
412 } 412 }
413 } 413 }
414 414
415 } // namespace shell 415 } // namespace shell
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698