Index: chrome/test/chromedriver/server/http_handler_unittest.cc |
diff --git a/chrome/test/chromedriver/server/http_handler_unittest.cc b/chrome/test/chromedriver/server/http_handler_unittest.cc |
index d516902c15973fec03c9ef4d48c5be4ee10a91b7..a4d81a490923b591c4151858916b5c2ad71a8a60 100644 |
--- a/chrome/test/chromedriver/server/http_handler_unittest.cc |
+++ b/chrome/test/chromedriver/server/http_handler_unittest.cc |
@@ -56,7 +56,7 @@ TEST(HttpHandlerTest, HandleUnknownCommand) { |
scoped_ptr<CommandExecutor>(new DummyExecutor()), |
scoped_ptr<HttpHandler::CommandMap>(new HttpHandler::CommandMap()), |
"/"); |
- HttpRequest request(kGet, "/path", ""); |
+ HttpRequest request(kGet, "/path", std::string()); |
HttpResponse response; |
handler.Handle(request, &response); |
ASSERT_EQ(HttpResponse::kNotFound, response.status()); |
@@ -68,7 +68,7 @@ TEST(HttpHandlerTest, HandleNewSession) { |
HttpHandler handler( |
scoped_ptr<CommandExecutor>(new DummyExecutor()), |
map.Pass(), "/base/"); |
- HttpRequest request(kPost, "/base/session", ""); |
+ HttpRequest request(kPost, "/base/session", std::string()); |
HttpResponse response; |
handler.Handle(request, &response); |
ASSERT_EQ(HttpResponse::kSeeOther, response.status()); |
@@ -96,7 +96,7 @@ TEST(HttpHandlerTest, HandleUnimplementedCommand) { |
HttpHandler handler( |
scoped_ptr<CommandExecutor>(new DummyExecutor(kUnknownCommand)), |
map.Pass(), "/"); |
- HttpRequest request(kPost, "/path", ""); |
+ HttpRequest request(kPost, "/path", std::string()); |
HttpResponse response; |
handler.Handle(request, &response); |
ASSERT_EQ(HttpResponse::kNotImplemented, response.status()); |
@@ -108,7 +108,7 @@ TEST(HttpHandlerTest, HandleCommand) { |
HttpHandler handler( |
scoped_ptr<CommandExecutor>(new DummyExecutor()), |
map.Pass(), "/"); |
- HttpRequest request(kPost, "/path", ""); |
+ HttpRequest request(kPost, "/path", std::string()); |
HttpResponse response; |
handler.Handle(request, &response); |
ASSERT_EQ(HttpResponse::kOk, response.status()); |
@@ -140,9 +140,9 @@ TEST(MatchesCommandTest, DiffPathLength) { |
ASSERT_FALSE(internal::MatchesCommand( |
kPost, "path", command, &session_id, ¶ms)); |
ASSERT_FALSE(internal::MatchesCommand( |
- kPost, "", command, &session_id, ¶ms)); |
- ASSERT_FALSE(internal::MatchesCommand( |
- kPost, "/", command, &session_id, ¶ms)); |
+ kPost, std::string(), command, &session_id, ¶ms)); |
+ ASSERT_FALSE( |
+ internal::MatchesCommand(kPost, "/", command, &session_id, ¶ms)); |
ASSERT_FALSE(internal::MatchesCommand( |
kPost, "path/path/path", command, &session_id, ¶ms)); |
} |