| 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 "services/files/files_test_base.h" | 5 #include "services/files/files_test_base.h" |
| 6 | 6 |
| 7 #include "mojo/public/cpp/application/application_impl.h" | 7 #include "mojo/public/cpp/application/application_impl.h" |
| 8 #include "mojo/services/files/interfaces/files.mojom.h" | 8 #include "mojo/services/files/interfaces/files.mojom.h" |
| 9 #include "mojo/services/files/interfaces/types.mojom.h" | 9 #include "mojo/services/files/interfaces/types.mojom.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 FilesTestBase::~FilesTestBase() {} | 16 FilesTestBase::~FilesTestBase() {} |
| 17 | 17 |
| 18 void FilesTestBase::SetUp() { | 18 void FilesTestBase::SetUp() { |
| 19 test::ApplicationTestBase::SetUp(); | 19 test::ApplicationTestBase::SetUp(); |
| 20 // TODO(vtl): Fix |ConnectToService()|. | 20 // TODO(vtl): Fix this. |
| 21 FilesPtr files_async; | 21 FilesPtr files_async; |
| 22 application_impl()->ConnectToService("mojo:files", &files_async); | 22 application_impl()->ConnectToServiceDeprecated("mojo:files", &files_async); |
| 23 files_ = | 23 files_ = |
| 24 SynchronousInterfacePtr<Files>::Create(files_async.PassInterfaceHandle()); | 24 SynchronousInterfacePtr<Files>::Create(files_async.PassInterfaceHandle()); |
| 25 } | 25 } |
| 26 | 26 |
| 27 void FilesTestBase::GetTemporaryRoot( | 27 void FilesTestBase::GetTemporaryRoot( |
| 28 SynchronousInterfacePtr<Directory>* directory) { | 28 SynchronousInterfacePtr<Directory>* directory) { |
| 29 Error error = Error::INTERNAL; | 29 Error error = Error::INTERNAL; |
| 30 ASSERT_TRUE( | 30 ASSERT_TRUE( |
| 31 files_->OpenFileSystem(nullptr, GetSynchronousProxy(directory), &error)); | 31 files_->OpenFileSystem(nullptr, GetSynchronousProxy(directory), &error)); |
| 32 ASSERT_EQ(Error::OK, error); | 32 ASSERT_EQ(Error::OK, error); |
| 33 } | 33 } |
| 34 | 34 |
| 35 void FilesTestBase::GetAppPersistentCacheRoot( | 35 void FilesTestBase::GetAppPersistentCacheRoot( |
| 36 SynchronousInterfacePtr<Directory>* directory) { | 36 SynchronousInterfacePtr<Directory>* directory) { |
| 37 Error error = Error::INTERNAL; | 37 Error error = Error::INTERNAL; |
| 38 ASSERT_TRUE(files_->OpenFileSystem("app_persistent_cache", | 38 ASSERT_TRUE(files_->OpenFileSystem("app_persistent_cache", |
| 39 GetSynchronousProxy(directory), &error)); | 39 GetSynchronousProxy(directory), &error)); |
| 40 ASSERT_EQ(Error::OK, error); | 40 ASSERT_EQ(Error::OK, error); |
| 41 } | 41 } |
| 42 | 42 |
| 43 } // namespace files | 43 } // namespace files |
| 44 } // namespace mojo | 44 } // namespace mojo |
| OLD | NEW |