Drop refs to net::EmbeddedTestServer / net::File{Path,URL} utils in mojo

mojo/shell/dynamic_application_loader.cc

Index: mojo/shell/dynamic_application_loader.cc
diff --git a/mojo/shell/dynamic_application_loader.cc b/mojo/shell/dynamic_application_loader.cc
index 1f24cf37fb16024b3c232baecc746838f2f21271..4c0cf7ef0953a8aadb4f72ce06641c1c1389d61b 100644
--- a/mojo/shell/dynamic_application_loader.cc
+++ b/mojo/shell/dynamic_application_loader.cc
@@ -11,12 +11,13 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "base/strings/utf_string_conversions.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/services/public/interfaces/network/url_loader.mojom.h"
 #include "mojo/shell/context.h"
+#include "mojo/shell/filename_util.h"
 #include "mojo/shell/switches.h"
-#include "net/base/filename_util.h"
 
 namespace mojo {
 namespace shell {
@@ -92,8 +93,12 @@ class DynamicApplicationLoader::LocalLoader : public Loader {
                load_callbacks,
                loader_complete_callback),
         weak_ptr_factory_(this) {
-    base::FilePath path;
-    net::FileURLToFilePath(url, &path);
+    DCHECK(url.SchemeIsFile());
+#if defined(OS_WIN)
+    base::FilePath path(base::ASCIIToUTF16(url.path()));

[brettw, 2014/10/09 22:26:29]

This isn't correct, the path on Windows will be "/C:/foo/bar". You'll want the
logic from FileURLToFilePath (maybe don't need the UNC stuff) that trims the
leading slash and replaces the forward slashes with backslashes. You could also
call FilePath.NormalizePathSeparators().

We also really need to unescape in both cases since we should be able to run in
non-ASCII directories. On Windows, this means doing UTF-8 -> UTF-16 conversion
after unescaping.

And I think this should be moved to the new file with a test like the reverse
conversion.

+#else
+    base::FilePath path(url.path());
+#endif
 
     // Async for consistency with network case.
     base::MessageLoop::current()->PostTask(