OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/filesystem/files_test_base.h" | 5 #include "components/filesystem/files_test_base.h" |
6 | 6 |
7 #include "components/filesystem/public/interfaces/directory.mojom.h" | 7 #include "components/filesystem/public/interfaces/directory.mojom.h" |
8 #include "components/filesystem/public/interfaces/types.mojom.h" | 8 #include "components/filesystem/public/interfaces/types.mojom.h" |
9 #include "mojo/application/public/cpp/application_impl.h" | 9 #include "mojo/application/public/cpp/application_impl.h" |
10 | 10 |
11 namespace mojo { | 11 namespace mojo { |
12 namespace files { | 12 namespace files { |
13 | 13 |
14 FilesTestBase::FilesTestBase() { | 14 FilesTestBase::FilesTestBase() { |
15 } | 15 } |
16 | 16 |
17 FilesTestBase::~FilesTestBase() { | 17 FilesTestBase::~FilesTestBase() { |
18 } | 18 } |
19 | 19 |
20 void FilesTestBase::SetUp() { | 20 void FilesTestBase::SetUp() { |
21 test::ApplicationTestBase::SetUp(); | 21 test::ApplicationTestBase::SetUp(); |
22 application_impl()->ConnectToService("mojo:files", &files_); | 22 |
| 23 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
| 24 request->url = mojo::String::From("mojo:files"); |
| 25 application_impl()->ConnectToService(request.Pass(), &files_); |
23 } | 26 } |
24 | 27 |
25 void FilesTestBase::GetTemporaryRoot(DirectoryPtr* directory) { | 28 void FilesTestBase::GetTemporaryRoot(DirectoryPtr* directory) { |
26 Error error = ERROR_INTERNAL; | 29 Error error = ERROR_INTERNAL; |
27 files()->OpenFileSystem(nullptr, GetProxy(directory), Capture(&error)); | 30 files()->OpenFileSystem(nullptr, GetProxy(directory), Capture(&error)); |
28 ASSERT_TRUE(files().WaitForIncomingMethodCall()); | 31 ASSERT_TRUE(files().WaitForIncomingMethodCall()); |
29 ASSERT_EQ(ERROR_OK, error); | 32 ASSERT_EQ(ERROR_OK, error); |
30 } | 33 } |
31 | 34 |
32 } // namespace files | 35 } // namespace files |
33 } // namespace mojo | 36 } // namespace mojo |
OLD | NEW |