Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2202)

Unified Diff: chrome/browser/net/websocket_browsertest.cc

Issue 889463003: GURL::Replacements methods accept a StringPiece instead of std::string&. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase (fixed some merge conflicts). Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/net/proxy_browsertest.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/websocket_browsertest.cc
diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc
index 7aee438cc23630cb2ea5c10feed179eba016ad17..3ef21c0b3961bd191558b53e68fd5245bd6c09f6 100644
--- a/chrome/browser/net/websocket_browsertest.cc
+++ b/chrome/browser/net/websocket_browsertest.cc
@@ -38,18 +38,16 @@ class WebSocketBrowserTest : public InProcessBrowserTest {
protected:
void NavigateToHTTP(const std::string& path) {
// Visit a HTTP page for testing.
- std::string scheme("http");
GURL::Replacements replacements;
- replacements.SetSchemeStr(scheme);
+ replacements.SetSchemeStr("http");
ui_test_utils::NavigateToURL(
browser(), ws_server_.GetURL(path).ReplaceComponents(replacements));
}
void NavigateToHTTPS(const std::string& path) {
// Visit a HTTPS page for testing.
- std::string scheme("https");
GURL::Replacements replacements;
- replacements.SetSchemeStr(scheme);
+ replacements.SetSchemeStr("https");
ui_test_utils::NavigateToURL(
browser(), wss_server_.GetURL(path).ReplaceComponents(replacements));
}
@@ -204,9 +202,8 @@ IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, WebSocketBasicAuthInHTTPURL) {
ASSERT_TRUE(ws_server_.Start());
// Open connect_check.html via HTTP with credentials in the URL.
- std::string scheme("http");
GURL::Replacements replacements;
- replacements.SetSchemeStr(scheme);
+ replacements.SetSchemeStr("http");
ui_test_utils::NavigateToURL(
browser(),
ws_server_.GetURLWithUserAndPassword("connect_check.html", "test", "test")
@@ -221,9 +218,8 @@ IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, WebSocketBasicAuthInHTTPSURL) {
ASSERT_TRUE(wss_server_.Start());
// Open connect_check.html via HTTPS with credentials in the URL.
- std::string scheme("https");
GURL::Replacements replacements;
- replacements.SetSchemeStr(scheme);
+ replacements.SetSchemeStr("https");
ui_test_utils::NavigateToURL(
browser(),
wss_server_.GetURLWithUserAndPassword(
« no previous file with comments | « chrome/browser/net/proxy_browsertest.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698