Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Side by Side Diff: base/process_util_unittest.cc

Issue 11961021: base: Convert scoped_arrays to the new scoped_ptr style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert callback changes Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #define _CRT_SECURE_NO_WARNINGS 5 #define _CRT_SECURE_NO_WARNINGS
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/alias.h" 10 #include "base/debug/alias.h"
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 EXPECT_TRUE(metrics->CalculateFreeMemory(&free_mem1)); 434 EXPECT_TRUE(metrics->CalculateFreeMemory(&free_mem1));
435 EXPECT_LT(10u, free_mem1.total); 435 EXPECT_LT(10u, free_mem1.total);
436 EXPECT_LT(10u, free_mem1.largest); 436 EXPECT_LT(10u, free_mem1.largest);
437 EXPECT_GT(2048u, free_mem1.total); 437 EXPECT_GT(2048u, free_mem1.total);
438 EXPECT_GT(2048u, free_mem1.largest); 438 EXPECT_GT(2048u, free_mem1.largest);
439 EXPECT_GE(free_mem1.total, free_mem1.largest); 439 EXPECT_GE(free_mem1.total, free_mem1.largest);
440 EXPECT_TRUE(NULL != free_mem1.largest_ptr); 440 EXPECT_TRUE(NULL != free_mem1.largest_ptr);
441 441
442 // Allocate 20M and check again. It should have gone down. 442 // Allocate 20M and check again. It should have gone down.
443 const int kAllocMB = 20; 443 const int kAllocMB = 20;
444 scoped_array<char> alloc(new char[kAllocMB * 1024 * 1024]); 444 scoped_ptr<char[]> alloc(new char[kAllocMB * 1024 * 1024]);
445 size_t expected_total = free_mem1.total - kAllocMB; 445 size_t expected_total = free_mem1.total - kAllocMB;
446 size_t expected_largest = free_mem1.largest; 446 size_t expected_largest = free_mem1.largest;
447 447
448 base::FreeMBytes free_mem2 = {0}; 448 base::FreeMBytes free_mem2 = {0};
449 EXPECT_TRUE(metrics->CalculateFreeMemory(&free_mem2)); 449 EXPECT_TRUE(metrics->CalculateFreeMemory(&free_mem2));
450 EXPECT_GE(free_mem2.total, free_mem2.largest); 450 EXPECT_GE(free_mem2.total, free_mem2.largest);
451 EXPECT_GE(expected_total, free_mem2.total); 451 EXPECT_GE(expected_total, free_mem2.total);
452 EXPECT_GE(expected_largest, free_mem2.largest); 452 EXPECT_GE(expected_largest, free_mem2.largest);
453 EXPECT_TRUE(NULL != free_mem2.largest_ptr); 453 EXPECT_TRUE(NULL != free_mem2.largest_ptr);
454 } 454 }
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
1211 SetUpInDeathAssert(); 1211 SetUpInDeathAssert();
1212 while ((value_ = base::AllocatePsychoticallyBigObjCObject())) {} 1212 while ((value_ = base::AllocatePsychoticallyBigObjCObject())) {}
1213 }, ""); 1213 }, "");
1214 } 1214 }
1215 1215
1216 #endif // !ARCH_CPU_64_BITS 1216 #endif // !ARCH_CPU_64_BITS
1217 #endif // OS_MACOSX 1217 #endif // OS_MACOSX
1218 1218
1219 #endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && 1219 #endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&
1220 // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER) 1220 // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698