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

Side by Side Diff: components/filesystem/files_test_base.cc

Issue 1157573002: Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 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 filesystem { 11 namespace filesystem {
12 12
13 FilesTestBase::FilesTestBase() { 13 FilesTestBase::FilesTestBase() {
14 } 14 }
15 15
16 FilesTestBase::~FilesTestBase() { 16 FilesTestBase::~FilesTestBase() {
17 } 17 }
18 18
19 void FilesTestBase::SetUp() { 19 void FilesTestBase::SetUp() {
20 ApplicationTestBase::SetUp(); 20 ApplicationTestBase::SetUp();
21 21
22 mojo::URLRequestPtr request(mojo::URLRequest::New()); 22 mojo::URLRequestPtr request(mojo::URLRequest::New());
23 request->url = mojo::String::From("mojo:files"); 23 request->url = mojo::String::From("mojo:files");
24 application_impl()->ConnectToService(request.Pass(), &files_); 24 application_impl()->ConnectToService(request.Pass(), &files_);
25 } 25 }
26 26
27 void FilesTestBase::GetTemporaryRoot(DirectoryPtr* directory) { 27 void FilesTestBase::GetTemporaryRoot(DirectoryPtr* directory) {
28 Error error = ERROR_INTERNAL; 28 Error error = ERROR_INTERNAL;
29 files()->OpenFileSystem(nullptr, GetProxy(directory), Capture(&error)); 29 files()->OpenFileSystem(nullptr, GetProxy(directory), Capture(&error));
30 ASSERT_TRUE(files().WaitForIncomingResponse()); 30 ASSERT_TRUE(files().WaitForIncomingMethodCall());
31 ASSERT_EQ(ERROR_OK, error); 31 ASSERT_EQ(ERROR_OK, error);
32 } 32 }
33 33
34 } // namespace filesystem 34 } // namespace filesystem
OLDNEW
« no previous file with comments | « components/filesystem/file_impl_unittest.cc ('k') | components/html_viewer/web_clipboard_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698