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

Unified Diff: mojo/runner/native_runner_unittest.cc

Issue 1109993002: Adds support for mojo apps to live in their own directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to trunk and move filename_util to own dir Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/runner/filename_util.cc ('k') | mojo/runner/shell_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/native_runner_unittest.cc
diff --git a/mojo/runner/native_runner_unittest.cc b/mojo/runner/native_runner_unittest.cc
index 499fb75109d95a919a3b6f06ebc3ac6947ab9e16..ca69dd48d2120d6847973eb39dba25b5d0cea38b 100644
--- a/mojo/runner/native_runner_unittest.cc
+++ b/mojo/runner/native_runner_unittest.cc
@@ -4,8 +4,8 @@
#include "base/files/scoped_temp_dir.h"
#include "mojo/runner/context.h"
-#include "mojo/runner/filename_util.h"
#include "mojo/shell/application_manager.h"
+#include "mojo/util/filename_util.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace mojo {
@@ -86,7 +86,7 @@ TEST_F(NativeApplicationLoaderTest, DoesNotExist) {
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
base::FilePath nonexistent_file(FILE_PATH_LITERAL("nonexistent.txt"));
- GURL url(FilePathToFileURL(temp_dir.path().Append(nonexistent_file)));
+ GURL url(util::FilePathToFileURL(temp_dir.path().Append(nonexistent_file)));
InterfaceRequest<ServiceProvider> services;
ServiceProviderPtr service_provider;
application_manager_.ConnectToApplication(
« no previous file with comments | « mojo/runner/filename_util.cc ('k') | mojo/runner/shell_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698