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"
+#include "url/url_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());
+    url::RawCanonOutputW<1024> output;
+    url::DecodeURLEscapeSequences(

[jamesr, 2014/10/16 21:41:37]

PTAL

+        url.path().data(), url.path().length(), &output);
+    base::string16 decoded_path =
+        base::string16(output.data(), output.length());
+#if defined(OS_WIN)
+    base::FilePath path(decoded_path);
+#else
+    base::FilePath path(base::UTF16ToUTF8(decoded_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