Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / history / url_utils_unittest.cc

diff --git a/src/chrome/browser/history/url_utils_unittest.cc b/src/chrome/browser/history/url_utils_unittest.cc
index b1ffb6a..970c5c0 100644 (file)
--- a/src/chrome/browser/history/url_utils_unittest.cc
+++ b/src/chrome/browser/history/url_utils_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/history/url_utils.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace history {
 
@@ -32,11 +33,11 @@ TEST(HistoryUrlUtilsTest, CanonicalURLStringCompare) {
     "http://www.google.com:80/",
     "https://www.google.com",
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(sorted_list); ++i) {
+  for (size_t i = 0; i < arraysize(sorted_list); ++i) {
     EXPECT_FALSE(CanonicalURLStringCompare(sorted_list[i], sorted_list[i]))
         << " for \"" << sorted_list[i] << "\" < \"" << sorted_list[i] << "\"";
     // Every disjoint pair-wise comparison.
-    for (size_t j = i + 1; j < ARRAYSIZE_UNSAFE(sorted_list); ++j) {
+    for (size_t j = i + 1; j < arraysize(sorted_list); ++j) {
       EXPECT_TRUE(CanonicalURLStringCompare(sorted_list[i], sorted_list[j]))
           << " for \"" << sorted_list[i] << "\" < \"" << sorted_list[j] << "\"";
       EXPECT_FALSE(CanonicalURLStringCompare(sorted_list[j], sorted_list[i]))
@@ -60,7 +61,7 @@ TEST(HistoryUrlUtilsTest, HaveSameSchemeHostAndPort) {
     {"http://www.google.com/test", "http://www.google.com/test/with/dir/"},
     {"http://www.google.com/test?", "http://www.google.com/test/with/dir/"},
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(true_cases); ++i) {
+  for (size_t i = 0; i < arraysize(true_cases); ++i) {
     EXPECT_TRUE(HaveSameSchemeHostAndPort(GURL(true_cases[i].s1),
                                GURL(true_cases[i].s2)))
         << " for true_cases[" << i << "]";
@@ -75,7 +76,7 @@ TEST(HistoryUrlUtilsTest, HaveSameSchemeHostAndPort) {
     {"http://www.google.com/path", "http://www.google.com:137/path"},
     {"http://www.google.com/same/dir", "http://www.youtube.com/same/dir"},
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(false_cases); ++i) {
+  for (size_t i = 0; i < arraysize(false_cases); ++i) {
     EXPECT_FALSE(HaveSameSchemeHostAndPort(GURL(false_cases[i].s1),
                                 GURL(false_cases[i].s2)))
         << " for false_cases[" << i << "]";
@@ -95,7 +96,7 @@ TEST(HistoryUrlUtilsTest, IsPathPrefix) {
     {"/test", "/test/with/dir/"},
     {"/test/", "/test/with/dir"},
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(true_cases); ++i) {
+  for (size_t i = 0; i < arraysize(true_cases); ++i) {
     EXPECT_TRUE(IsPathPrefix(true_cases[i].p1, true_cases[i].p2))
         << " for true_cases[" << i << "]";
   }
@@ -110,7 +111,7 @@ TEST(HistoryUrlUtilsTest, IsPathPrefix) {
     {"/test", "/test-bed"},
     {"/test-", "/test"},
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(false_cases); ++i) {
+  for (size_t i = 0; i < arraysize(false_cases); ++i) {
     EXPECT_FALSE(IsPathPrefix(false_cases[i].p1, false_cases[i].p2))
         << " for false_cases[" << i << "]";
   }