| Index: chrome/browser/ui/browser_browsertest.cc
|
| diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
|
| index 5e6b769e749d43a294ee8795cbb7654628f423a5..e2531022493c7990592cc89a11f579021b709e37 100644
|
| --- a/chrome/browser/ui/browser_browsertest.cc
|
| +++ b/chrome/browser/ui/browser_browsertest.cc
|
| @@ -558,7 +558,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) {
|
| base::FilePath(kDocRoot));
|
| ASSERT_TRUE(https_test_server.Start());
|
| GURL http_url(test_server()->GetURL("files/title1.html"));
|
| - GURL https_url(https_test_server.GetURL(""));
|
| + GURL https_url(https_test_server.GetURL(std::string()));
|
|
|
| // Start with an http URL.
|
| ui_test_utils::NavigateToURL(browser(), http_url);
|
| @@ -647,7 +647,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) {
|
| base::FilePath(kDocRoot));
|
| ASSERT_TRUE(https_test_server.Start());
|
| GURL http_url(test_server()->GetURL("files/title1.html"));
|
| - GURL https_url(https_test_server.GetURL(""));
|
| + GURL https_url(https_test_server.GetURL(std::string()));
|
|
|
| // Start with an http URL.
|
| ui_test_utils::NavigateToURL(browser(), http_url);
|
| @@ -747,7 +747,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttp) {
|
| browser()->command_controller()->command_updater();
|
|
|
| ASSERT_TRUE(test_server()->Start());
|
| - GURL http_url(test_server()->GetURL(""));
|
| + GURL http_url(test_server()->GetURL(std::string()));
|
| ASSERT_TRUE(http_url.SchemeIs(chrome::kHttpScheme));
|
| ui_test_utils::NavigateToURL(browser(), http_url);
|
| EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
|
| @@ -775,7 +775,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) {
|
| net::TestServer::kLocalhost,
|
| base::FilePath(kDocRoot));
|
| ASSERT_TRUE(test_server.Start());
|
| - GURL ftp_url(test_server.GetURL(""));
|
| + GURL ftp_url(test_server.GetURL(std::string()));
|
| ASSERT_TRUE(ftp_url.SchemeIs(chrome::kFtpScheme));
|
| ui_test_utils::NavigateToURL(browser(), ftp_url);
|
| EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
|
| @@ -807,7 +807,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) {
|
| // DISABLED: http://crbug.com/72310
|
| IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) {
|
| ASSERT_TRUE(test_server()->Start());
|
| - GURL http_url(test_server()->GetURL(""));
|
| + GURL http_url(test_server()->GetURL(std::string()));
|
| ASSERT_TRUE(http_url.SchemeIs(chrome::kHttpScheme));
|
|
|
| ASSERT_EQ(1, browser()->tab_strip_model()->count());
|
|
|