Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

services/dart/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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "base/strings/string_util.h"
+#include "base/strings/string_split.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/dart/embedder/dart_controller.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
@@ skipping 10 matching lines @@
 
 const char kCompleteTimeline[] = "--complete-timeline";
 const char kEnableStrictMode[] = "--enable-strict-mode";
 const char kDisableObservatory[] = "--disable-observatory";
 const char kTraceStartup[] = "--trace-startup";
 const char kRunOnMessageLoop[] = "--run-on-message-loop";
 
 static bool IsDartZip(std::string url) {
   // If the url doesn't end with ".dart" we assume it is a zipped up
   // dart application.
-  return !EndsWith(url, ".dart", false);
+  return !base::EndsWith(url, ".dart", base::CompareCase::INSENSITIVE_ASCII);
 }
 
 class DartContentHandlerApp;
 
 class DartContentHandler : public mojo::ContentHandlerFactory::ManagedDelegate {
  public:
   DartContentHandler(DartContentHandlerApp* app, bool strict)
       : app_(app), strict_(strict) {
   }
 
@@ skipping 101 matching lines @@
     }
     if (!success) {
       LOG(ERROR) << "Dart VM Initialization failed";
     }
   }
 
   bool HasStrictQueryParam(const std::string& requestedUrl) {
     bool strict_compilation = false;
     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);
       strict_compilation =
           std::find(query_parameters.begin(), query_parameters.end(),
                     "strict=true") != query_parameters.end();
     }
     return strict_compilation;
   }
 
   // Overridden from ApplicationDelegate:
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
@@ skipping 69 matching lines @@
                     run_on_message_loop));
   }
 }
 
 }  // namespace dart
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new dart::DartContentHandlerApp);
   return runner.Run(application_request);
 }