Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

gin/modules/file_module_provider.cc

 // Copyright 2013 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 "gin/modules/file_module_provider.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "gin/converter.h"
 
 namespace gin {
 
 namespace {
 
 void AttempToLoadModule(const base::WeakPtr<Runner>& runner,
                         const std::vector<base::FilePath>& search_paths,
                         const std::string& id) {
   if (!runner)
     return;
 
-  std::vector<std::string> components;
-  base::SplitString(id, '/', &components);
+  std::vector<std::string> components =
+      base::SplitString(id, "/", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   base::FilePath path;
   for (size_t i = 0; i < components.size(); ++i) {
     // TODO(abarth): Technically the path components can be UTF-8. We don't
     // handle that case correctly yet.
     path = path.AppendASCII(components[i]);
   }
   path = path.AddExtension(FILE_PATH_LITERAL("js"));
 
   for (size_t i = 0; i < search_paths.size(); ++i) {
@@ skipping 26 matching lines @@
     const std::string& id = *it;
     if (attempted_ids_.count(id))
       continue;
     attempted_ids_.insert(id);
     base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
         AttempToLoadModule, runner->GetWeakPtr(), search_paths_, id));
   }
 }
 
 }  // namespace gin