More Windows build fixes.

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/string_util.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/data_pipe_peek.h"
 #include "mojo/shell/filename_util.h"
 #include "mojo/shell/switches.h"
 #include "url/url_util.h"
 
@@ skipping 71 matching lines @@
                load_callbacks,
                loader_complete_callback),
         weak_ptr_factory_(this) {
     DCHECK(url.SchemeIsFile());
     url::RawCanonOutputW<1024> output;
     url::DecodeURLEscapeSequences(
         url.path().data(), static_cast<int>(url.path().length()), &output);
     base::string16 decoded_path =
         base::string16(output.data(), output.length());
 #if defined(OS_WIN)
+    base::TrimString(decoded_path, L"/", &decoded_path);
     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(),
@@ skipping 182 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