| Index: third_party/WebKit/Source/platform/weborigin/KURLTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp b/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp
|
| index 8746f2af4f989b0b28a9701d5cde37140a3782f3..13cdda7e8d3df67f7cca018b38c393448108ba8c 100644
|
| --- a/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp
|
| @@ -367,46 +367,46 @@
|
| url::AddStandardScheme("http-so", url::SCHEME_WITH_PORT);
|
| url::AddStandardScheme("https-so", url::SCHEME_WITH_PORT);
|
|
|
| - KURL kurl(ParsedURLString, "foo://www.google.com/");
|
| + KURL kurl;
|
| EXPECT_TRUE(kurl.setProtocol("http"));
|
| EXPECT_TRUE(kurl.protocolIs("http"));
|
| - EXPECT_TRUE(kurl.protocolIsInHTTPFamily());
|
| - EXPECT_TRUE(kurl.isValid());
|
| + EXPECT_FALSE(kurl.isValid());
|
|
|
| EXPECT_TRUE(kurl.setProtocol("http-so"));
|
| EXPECT_TRUE(kurl.protocolIs("http-so"));
|
| - EXPECT_TRUE(kurl.isValid());
|
| + EXPECT_FALSE(kurl.isValid());
|
|
|
| EXPECT_TRUE(kurl.setProtocol("https"));
|
| EXPECT_TRUE(kurl.protocolIs("https"));
|
| - EXPECT_TRUE(kurl.isValid());
|
| + EXPECT_FALSE(kurl.isValid());
|
|
|
| EXPECT_TRUE(kurl.setProtocol("https-so"));
|
| EXPECT_TRUE(kurl.protocolIs("https-so"));
|
| - EXPECT_TRUE(kurl.isValid());
|
| + EXPECT_FALSE(kurl.isValid());
|
|
|
| EXPECT_TRUE(kurl.setProtocol("ftp"));
|
| EXPECT_TRUE(kurl.protocolIs("ftp"));
|
| - EXPECT_TRUE(kurl.isValid());
|
| + EXPECT_FALSE(kurl.isValid());
|
|
|
| kurl = KURL(KURL(), "http://");
|
| - EXPECT_FALSE(kurl.protocolIs("http"));
|
| -
|
| - kurl = KURL(KURL(), "http://wide#ιΈ‘");
|
| EXPECT_TRUE(kurl.protocolIs("http"));
|
| - EXPECT_EQ(kurl.protocol(), "http");
|
| -
|
| - kurl = KURL(KURL(), "http-so://foo");
|
| + EXPECT_FALSE(kurl.isValid());
|
| +
|
| + kurl = KURL(KURL(), "http-so://");
|
| EXPECT_TRUE(kurl.protocolIs("http-so"));
|
| -
|
| - kurl = KURL(KURL(), "https://foo");
|
| + EXPECT_FALSE(kurl.isValid());
|
| +
|
| + kurl = KURL(KURL(), "https://");
|
| EXPECT_TRUE(kurl.protocolIs("https"));
|
| -
|
| - kurl = KURL(KURL(), "https-so://foo");
|
| + EXPECT_FALSE(kurl.isValid());
|
| +
|
| + kurl = KURL(KURL(), "https-so://");
|
| EXPECT_TRUE(kurl.protocolIs("https-so"));
|
| -
|
| - kurl = KURL(KURL(), "ftp://foo");
|
| + EXPECT_FALSE(kurl.isValid());
|
| +
|
| + kurl = KURL(KURL(), "ftp://");
|
| EXPECT_TRUE(kurl.protocolIs("ftp"));
|
| + EXPECT_FALSE(kurl.isValid());
|
|
|
| kurl = KURL(KURL(), "http://host/");
|
| EXPECT_TRUE(kurl.isValid());
|
| @@ -699,6 +699,7 @@
|
|
|
| KURL invalidUTF8(ParsedURLString, "http://a@9%aa%:");
|
| EXPECT_FALSE(invalidUTF8.protocolIs("http"));
|
| + EXPECT_TRUE(invalidUTF8.protocolIs(""));
|
|
|
| KURL capital(KURL(), "HTTP://www.example.text");
|
| EXPECT_TRUE(capital.protocolIs("http"));
|
|
|