Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

shell/shell_apptest.cc

 // Copyright 2015 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/base_paths.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "mojo/converters/base/base_type_converters.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/interfaces/application/application_connector.mojom.h"
 #include "mojo/services/http_server/cpp/http_server_util.h"
 #include "mojo/services/http_server/interfaces/http_server.mojom.h"
 #include "mojo/services/http_server/interfaces/http_server_factory.mojom.h"
 #include "mojo/services/network/interfaces/net_address.mojom.h"
@@ skipping 15 matching lines @@
              uint16_t port)
       : binding_(this, request.Pass()), port_(port) {}
   ~GetHandler() override {}
 
  private:
   // http_server::HttpHandler:
   void HandleRequest(http_server::HttpRequestPtr request,
                      const mojo::Callback<void(http_server::HttpResponsePtr)>&
                          callback) override {
     http_server::HttpResponsePtr response;
-    if (StartsWithASCII(request->relative_url, "/app", true)) {
+    if (base::StartsWith(request->relative_url.To<base::StringPiece>(), "/app",
+                         base::CompareCase::SENSITIVE)) {
       response = http_server::CreateHttpResponse(
           200, std::string(shell::test::kPingable.data,
                            shell::test::kPingable.size));
       response->content_type = "application/octet-stream";
     } else if (request->relative_url == "/redirect") {
       response = http_server::HttpResponse::New();
       response->status_code = 302;
       response->custom_headers.insert("Location", GetURL(port_, "app"));
     } else {
       NOTREACHED();
@@ skipping 122 matching lines @@
   pingable2->Ping("hello", callbacks_builder(2));
   base::RunLoop().Run();
 }
 
 // mojo: URLs can have querystrings too
 TEST_F(ShellAppTest, MojoURLQueryHandling) {
   PingablePtr pingable;
   application_impl()->ConnectToService("mojo:pingable_app?foo", &pingable);
   auto callback = [](const String& app_url, const String& connection_url,
                      const String& message) {
-    EXPECT_TRUE(EndsWith(app_url, "/pingable_app.mojo", true));
+    EXPECT_TRUE(base::EndsWith(app_url.To<base::StringPiece>(),
+                               "/pingable_app.mojo",
+                               base::CompareCase::SENSITIVE));
     EXPECT_EQ(app_url.To<std::string>() + "?foo", connection_url);
     EXPECT_EQ("hello", message);
     base::MessageLoop::current()->Quit();
   };
   pingable->Ping("hello", callback);
   base::RunLoop().Run();
 }
 
 void TestApplicationConnector(mojo::ApplicationConnector* app_connector) {
   PingablePtr pingable;
   ConnectToService(app_connector, "mojo:pingable_app", &pingable);
   auto callback = [](const String& app_url, const String& connection_url,
                      const String& message) {
-    EXPECT_TRUE(EndsWith(app_url, "/pingable_app.mojo", true));
+    EXPECT_TRUE(base::EndsWith(app_url.To<base::StringPiece>(),
+                               "/pingable_app.mojo",
+                               base::CompareCase::SENSITIVE));
     EXPECT_EQ(app_url, connection_url);
     EXPECT_EQ("hello", message);
     base::MessageLoop::current()->Quit();
   };
   pingable->Ping("hello", callback);
   base::RunLoop().Run();
 }
 
 TEST_F(ShellAppTest, ApplicationConnector) {
   mojo::ApplicationConnectorPtr app_connector;
@@ skipping 17 matching lines @@
   }
 
   // The first one should still work.
   {
     SCOPED_TRACE("app_connector1 again");
     TestApplicationConnector(app_connector1.get());
   }
 }
 
 }  // namespace