Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / weborigin / KURLTest.cpp

diff --git a/src/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp b/src/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp
index 96d3456..a708ea3 100644 (file)
--- a/src/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp
+++ b/src/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp
@@ -75,7 +75,7 @@ TEST(KURLTest, SameGetters)
         {"javascript:hello!//world", "javascript", "", 0, "", 0, "world", 0, 0, false},
     };
 
-    for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
+    for (size_t i = 0; i < arraysize(cases); i++) {
         // UTF-8
         blink::KURL kurl(blink::ParsedURLString, cases[i].url);
 
@@ -238,7 +238,7 @@ TEST(KURLTest, Setters)
         },
     };
 
-    for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
+    for (size_t i = 0; i < arraysize(cases); i++) {
         blink::KURL kurl(blink::ParsedURLString, cases[i].url);
 
         kurl.setProtocol(cases[i].protocol);
@@ -287,7 +287,7 @@ TEST(KURLTest, Decode)
         {"%e4%bd%a0%e5%a5%bd", "\xe4\xbd\xa0\xe5\xa5\xbd"},
     };
 
-    for (size_t i = 0; i < ARRAYSIZE_UNSAFE(decodeCases); i++) {
+    for (size_t i = 0; i < arraysize(decodeCases); i++) {
         WTF::String input(decodeCases[i].input);
         WTF::String str = blink::decodeURLEscapeSequences(input);
         EXPECT_STREQ(decodeCases[i].output, str.utf8().data());
@@ -331,7 +331,7 @@ TEST(KURLTest, Encode)
           "pqrstuvwxyz%7B%7C%7D~%7F"},
     };
 
-    for (size_t i = 0; i < ARRAYSIZE_UNSAFE(encode_cases); i++) {
+    for (size_t i = 0; i < arraysize(encode_cases); i++) {
         WTF::String input(encode_cases[i].input);
         WTF::String expectedOutput(encode_cases[i].output);
         WTF::String output = blink::encodeWithURLEscapeSequences(input);
@@ -499,22 +499,22 @@ TEST(KURLTest, Empty)
 
     // Test resolving a null URL on an empty string.
     blink::KURL kurl2(kurl, "");
-    EXPECT_TRUE(kurl2.isNull());
+    EXPECT_FALSE(kurl2.isNull());
     EXPECT_TRUE(kurl2.isEmpty());
     EXPECT_FALSE(kurl2.isValid());
-    EXPECT_TRUE(kurl2.string().isNull());
+    EXPECT_FALSE(kurl2.string().isNull());
     EXPECT_TRUE(kurl2.string().isEmpty());
-    EXPECT_TRUE(kurl2.string().isNull());
+    EXPECT_FALSE(kurl2.string().isNull());
     EXPECT_TRUE(kurl2.string().isEmpty());
 
     // Resolve the null URL on a null string.
     blink::KURL kurl22(kurl, WTF::String());
-    EXPECT_TRUE(kurl22.isNull());
+    EXPECT_FALSE(kurl22.isNull());
     EXPECT_TRUE(kurl22.isEmpty());
     EXPECT_FALSE(kurl22.isValid());
-    EXPECT_TRUE(kurl22.string().isNull());
+    EXPECT_FALSE(kurl22.string().isNull());
     EXPECT_TRUE(kurl22.string().isEmpty());
-    EXPECT_TRUE(kurl22.string().isNull());
+    EXPECT_FALSE(kurl22.string().isNull());
     EXPECT_TRUE(kurl22.string().isEmpty());
 
     // Test non-hierarchical schemes resolving. The actual URLs will be different.
@@ -539,13 +539,13 @@ TEST(KURLTest, Empty)
     // EXPECT_EQ(kurl5.isEmpty(), kurl5.isEmpty());
     // EXPECT_EQ(kurl5.string().isEmpty(), kurl5.string().isEmpty());
     EXPECT_FALSE(kurl5.isValid());
-    EXPECT_TRUE(kurl5.string().isNull());
+    EXPECT_FALSE(kurl5.string().isNull());
 
     // Empty string as input
     blink::KURL kurl6(blink::ParsedURLString, "");
     EXPECT_TRUE(kurl6.isEmpty());
     EXPECT_FALSE(kurl6.isValid());
-    EXPECT_TRUE(kurl6.string().isNull());
+    EXPECT_FALSE(kurl6.string().isNull());
     EXPECT_TRUE(kurl6.string().isEmpty());
 
     // Non-empty but invalid C string as input.
@@ -554,7 +554,7 @@ TEST(KURLTest, Empty)
     // We don't do that.
     // EXPECT_EQ(kurl7.isEmpty(), kurl7.isEmpty());
     EXPECT_FALSE(kurl7.isValid());
-    EXPECT_TRUE(kurl7.string().isNull());
+    EXPECT_FALSE(kurl7.string().isNull());
 }
 
 TEST(KURLTest, UserPass)
@@ -697,7 +697,7 @@ TEST(KURLTest, strippedForUseAsReferrer)
         {"https://www.google.com/a?f#b", "https://www.google.com/a?f"},
     };
 
-    for (size_t i = 0; i < ARRAYSIZE_UNSAFE(referrerCases); i++) {
+    for (size_t i = 0; i < arraysize(referrerCases); i++) {
         blink::KURL kurl(blink::ParsedURLString, referrerCases[i].input);
         WTF::String referrer = kurl.strippedForUseAsReferrer();
         EXPECT_STREQ(referrerCases[i].output, referrer.utf8().data());