Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

shell/context.cc

Index: shell/context.cc
diff --git a/shell/context.cc b/shell/context.cc
index 4abe1271da5ea53a828bfb5a38bab72b118a5e82..3154c8a61e5cb5a3e6e3e268e302d474f3736f5a 100644
--- a/shell/context.cc
+++ b/shell/context.cc
@@ -138,8 +138,8 @@ void InitContentHandlers(ApplicationManager* manager,
   base::ReplaceSubstringsAfterOffset(&handlers_spec, 0, "\\,", ",");
 #endif
 
-  std::vector<std::string> parts;
-  base::SplitString(handlers_spec, ',', &parts);
+  std::vector<std::string> parts = base::SplitString(
+      handlers_spec, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (parts.size() % 2 != 0) {
     LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers
                << ": must be a comma-separated list of mimetype/url pairs."
@@ -162,9 +162,9 @@ void InitContentHandlers(ApplicationManager* manager,
 
 void InitNativeOptions(ApplicationManager* manager,
                        const base::CommandLine& command_line) {
-  std::vector<std::string> force_in_process_url_list;
-  base::SplitString(command_line.GetSwitchValueASCII(switches::kForceInProcess),
-                    ',', &force_in_process_url_list);
+  std::vector<std::string> force_in_process_url_list = base::SplitString(
+      command_line.GetSwitchValueASCII(switches::kForceInProcess), ",",
+      base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   for (const auto& force_in_process_url : force_in_process_url_list) {
     GURL url(force_in_process_url);
     if (!url.is_valid()) {