Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

services/python/content_handler/content_handler_main.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 <dlfcn.h>
 #include <python2.7/Python.h>
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/icu_util.h"
-#include "base/strings/string_util.h"
+#include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/public/python/src/common.h"
 #include "third_party/zlib/google/zip_reader.h"
@@ skipping 195 matching lines @@
     if (IsDebug(connection->GetConnectionURL()))
       connection->AddService(&debug_content_handler_factory_);
     else
       connection->AddService(&content_handler_factory_);
     return true;
   }
 
   bool IsDebug(const std::string& requestedUrl) {
     GURL url(requestedUrl);
     if (url.has_query()) {
-      std::vector<std::string> query_parameters;
-      Tokenize(url.query(), "&", &query_parameters);
+      std::vector<std::string> query_parameters = base::SplitString(
+          url.query(), "&", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
       return std::find(query_parameters.begin(), query_parameters.end(),
                        "debug=true") != query_parameters.end();
     }
     return false;
   }
 
   PythonContentHandler content_handler_;
   PythonContentHandler debug_content_handler_;
   ContentHandlerFactory content_handler_factory_;
   ContentHandlerFactory debug_content_handler_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PythonContentHandlerApp);
 };
 
 }  // namespace content_handler
 }  // namespace python
 }  // namespace services
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(
       new services::python::content_handler::PythonContentHandlerApp());
   return runner.Run(application_request);
 }