| Index: services/navigation/navigation_unittest.cc
|
| diff --git a/services/navigation/navigation_unittest.cc b/services/navigation/navigation_unittest.cc
|
| index 8eb2323e09cff9f5c782f71da8e1bb4e8c819985..1237ebb53f115b1a2401e41d5d9f7ce61eb08e49 100644
|
| --- a/services/navigation/navigation_unittest.cc
|
| +++ b/services/navigation/navigation_unittest.cc
|
| @@ -12,17 +12,17 @@
|
|
|
| namespace navigation {
|
|
|
| -class NavigationTest : public shell::test::ServiceTest,
|
| +class NavigationTest : public service_manager::test::ServiceTest,
|
| public mojom::ViewClient {
|
| public:
|
| NavigationTest()
|
| - : shell::test::ServiceTest("exe:navigation_unittests"),
|
| + : service_manager::test::ServiceTest("exe:navigation_unittests"),
|
| binding_(this) {}
|
| ~NavigationTest() override {}
|
|
|
| protected:
|
| void SetUp() override {
|
| - shell::test::ServiceTest::SetUp();
|
| + service_manager::test::ServiceTest::SetUp();
|
| window_manager_connection_ = connector()->Connect("service:test_wm");
|
| }
|
|
|
| @@ -65,7 +65,7 @@ class NavigationTest : public shell::test::ServiceTest,
|
| int load_count_ = 0;
|
| mojo::Binding<mojom::ViewClient> binding_;
|
| base::RunLoop* loop_ = nullptr;
|
| - std::unique_ptr<shell::Connection> window_manager_connection_;
|
| + std::unique_ptr<service_manager::Connection> window_manager_connection_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NavigationTest);
|
| };
|
|
|