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

mojo/shell/dynamic_application_loader.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/shell/dynamic_application_loader.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #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 {
 
 // Encapsulates loading and running one individual application.
 //
 // Loaders are owned by DynamicApplicationLoader. DynamicApplicationLoader must
 // ensure that all the parameters passed to Loader subclasses stay valid through
 // Loader's lifetime.
 //
@@ skipping 55 matching lines @@
   LocalLoader(const GURL& url,
               Context* context,
               DynamicServiceRunnerFactory* runner_factory,
               scoped_refptr<ApplicationLoader::LoadCallbacks> load_callbacks,
               const LoaderCompleteCallback& loader_complete_callback)
       : Loader(context,
                runner_factory,
                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(
         FROM_HERE,
         base::Bind(&LocalLoader::RunLibrary,
                    weak_ptr_factory_.GetWeakPtr(),
                    path,
                    base::PathExists(path)));
   }
 
@@ skipping 132 matching lines @@
   // TODO(darin): What should we do about service errors? This implies that
   // the app closed its handle to the service manager. Maybe we don't care?
 }
 
 void DynamicApplicationLoader::LoaderComplete(Loader* loader) {
   loaders_.erase(std::find(loaders_.begin(), loaders_.end(), loader));
 }
 
 }  // namespace shell
 }  // namespace mojo