shell/shell_test_base_android.cc - Issue 868283006: Rename MojoURLResolver to URLResolver

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: shell/shell_test_base_android.cc

Issue 868283006: Rename MojoURLResolver to URLResolver (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Garbage char Created 5 years, 10 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

« no previous file with comments | « shell/shell_test_base.cc ('k') | shell/shell_test_helper.h » ('j') | shell/url_resolver.h » ('J')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "shell/shell_test_base.h"	5 #include "shell/shell_test_base.h"

6	6

7 #include "base/android/jni_android.h"	7 #include "base/android/jni_android.h"

8 #include "base/android/jni_string.h"	8 #include "base/android/jni_string.h"

9 #include "base/files/file_path.h"	9 #include "base/files/file_path.h"

10 #include "base/files/file_util.h"	10 #include "base/files/file_util.h"

(...skipping 19 matching lines...) Expand all Loading...
30	30

31 } // namespace	31 } // namespace

32	32

33 void ShellTestBase::SetUpTestApplications() {	33 void ShellTestBase::SetUpTestApplications() {

34 // Extract mojo applications, and set the resolve base URL to the directory	34 // Extract mojo applications, and set the resolve base URL to the directory

35 // containing those.	35 // containing those.

36 JNIEnv* env = InitEnv();	36 JNIEnv* env = InitEnv();

37 base::android::ScopedJavaLocalRef<jstring> service_dir(	37 base::android::ScopedJavaLocalRef<jstring> service_dir(

38 Java_ShellTestBase_extractMojoApplications(	38 Java_ShellTestBase_extractMojoApplications(

39 env, base::android::GetApplicationContext()));	39 env, base::android::GetApplicationContext()));

40 shell_context_.mojo_url_resolver()->SetBaseURL(	40 shell_context_.url_resolver()->SetMojoBaseURL(

41 FilePathToFileURL(base::FilePath(	41 FilePathToFileURL(base::FilePath(

42 base::android::ConvertJavaStringToUTF8(env, service_dir.obj()))));	42 base::android::ConvertJavaStringToUTF8(env, service_dir.obj()))));

43 }	43 }

44	44

45 } // namespace test	45 } // namespace test

46 } // namespace shell	46 } // namespace shell

47 } // namespace mojo	47 } // namespace mojo

OLD	NEW