Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / socket / udp_socket_unittest.cc

diff --git a/src/chrome/browser/extensions/api/socket/udp_socket_unittest.cc b/src/chrome/browser/extensions/api/socket/udp_socket_unittest.cc
index d17898b..d9c4993 100644 (file)
--- a/src/chrome/browser/extensions/api/socket/udp_socket_unittest.cc
+++ b/src/chrome/browser/extensions/api/socket/udp_socket_unittest.cc
@@ -32,7 +32,7 @@ static void OnCompleted(int bytes_read,
 }
 
 static const char test_message[] = "$$TESTMESSAGETESTMESSAGETESTMESSAGETEST$$";
-static const int test_message_length = ARRAYSIZE_UNSAFE(test_message);
+static const int test_message_length = arraysize(test_message);
 
 static void OnSendCompleted(int result) {
   EXPECT_EQ(test_message_length, result);
@@ -50,7 +50,7 @@ TEST(UDPSocketUnitTest, TestUDPSocketRecvFrom) {
 }
 
 TEST(UDPSocketUnitTest, TestUDPMulticastJoinGroup) {
-  const char* kGroup = "237.132.100.17";
+  const char kGroup[] = "237.132.100.17";
   UDPSocket src("abcdefghijklmnopqrst");
   UDPSocket dest("abcdefghijklmnopqrst");
 
@@ -66,7 +66,7 @@ TEST(UDPSocketUnitTest, TestUDPMulticastJoinGroup) {
 }
 
 TEST(UDPSocketUnitTest, TestUDPMulticastTimeToLive) {
-  const char* kGroup = "237.132.100.17";
+  const char kGroup[] = "237.132.100.17";
   UDPSocket socket("abcdefghijklmnopqrst");
   EXPECT_NE(0, socket.SetMulticastTimeToLive(-1));  // Negative TTL shall fail.
   EXPECT_EQ(0, socket.SetMulticastTimeToLive(3));
@@ -74,7 +74,7 @@ TEST(UDPSocketUnitTest, TestUDPMulticastTimeToLive) {
 }
 
 TEST(UDPSocketUnitTest, TestUDPMulticastLoopbackMode) {
-  const char* kGroup = "237.132.100.17";
+  const char kGroup[] = "237.132.100.17";
   UDPSocket socket("abcdefghijklmnopqrst");
   EXPECT_EQ(0, socket.SetMulticastLoopbackMode(false));
   socket.Connect(kGroup, 13333, base::Bind(&OnConnected));
@@ -110,7 +110,7 @@ static void OnMulticastReadCompleted(bool *packet_received,
 
 TEST(UDPSocketUnitTest, TestUDPMulticastRecv) {
   const int kPort = 9999;
-  const char* const kGroup = "237.132.100.17";
+  const char kGroup[] = "237.132.100.17";
   bool packet_received = false;
   base::MessageLoopForIO io_loop;  // For Read to do its threaded work.
   UDPSocket dest("abcdefghijklmnopqrst");