Try to consistently use arraysize() with strlcpy().

net/disk_cache/mapped_file_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "net/disk_cache/disk_cache_test_base.h"
 #include "net/disk_cache/disk_cache_test_util.h"
 #include "net/disk_cache/mapped_file.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 int g_cache_tests_max_id;
@@ skipping 55 matching lines @@
 TEST_F(DiskCacheTest, MappedFile_SyncIO) {
   std::wstring filename = GetCachePath();
   file_util::AppendToPath(&filename, L"a_test");
   scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile);
   ASSERT_TRUE(CreateCacheTestFile(filename.c_str()));
   ASSERT_TRUE(file->Init(filename, 8192));
 
   char buffer1[20];
   char buffer2[20];
   CacheTestFillBuffer(buffer1, sizeof(buffer1), false);
-  base::strlcpy(buffer1, "the data", sizeof(buffer1));
+  base::strlcpy(buffer1, "the data", arraysize(buffer1));
   EXPECT_TRUE(file->Write(buffer1, sizeof(buffer1), 8192));
   EXPECT_TRUE(file->Read(buffer2, sizeof(buffer2), 8192));
   EXPECT_STREQ(buffer1, buffer2);
 }
 
 TEST_F(DiskCacheTest, MappedFile_AsyncIO) {
   std::wstring filename = GetCachePath();
   file_util::AppendToPath(&filename, L"a_test");
   scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile);
   ASSERT_TRUE(CreateCacheTestFile(filename.c_str()));
   ASSERT_TRUE(file->Init(filename, 8192));
 
   FileCallbackTest callback(1);
   g_cache_tests_error = false;
   g_cache_tests_max_id = 0;
   g_cache_tests_received = 0;
 
   MessageLoopHelper helper;
 
   char buffer1[20];
   char buffer2[20];
   CacheTestFillBuffer(buffer1, sizeof(buffer1), false);
-  base::strlcpy(buffer1, "the data", sizeof(buffer1));
+  base::strlcpy(buffer1, "the data", arraysize(buffer1));
   bool completed;
   EXPECT_TRUE(file->Write(buffer1, sizeof(buffer1), 1024 * 1024, &callback,
               &completed));
   int expected = completed ? 0 : 1;
 
   g_cache_tests_max_id = 1;
   helper.WaitUntilCacheIoFinished(expected);
 
   EXPECT_TRUE(file->Read(buffer2, sizeof(buffer2), 1024 * 1024, &callback,
               &completed));
   if (!completed)
     expected++;
 
   helper.WaitUntilCacheIoFinished(expected);
 
   EXPECT_EQ(expected, g_cache_tests_received);
   EXPECT_FALSE(g_cache_tests_error);
   EXPECT_STREQ(buffer1, buffer2);
 }