summaryrefslogtreecommitdiffstats
path: root/base/string_util_unittest.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 04:55:06 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 04:55:06 +0000
commit022eab67d0b3476ee1d35cb463990170c982429b (patch)
treeb2c5517fa9e5f7a0fd7ac6938f6cac80d250d797 /base/string_util_unittest.cc
parent40d9ddf8fae7521890415be1eb0d2ad8f18453a9 (diff)
downloadchromium_src-022eab67d0b3476ee1d35cb463990170c982429b.zip
chromium_src-022eab67d0b3476ee1d35cb463990170c982429b.tar.gz
chromium_src-022eab67d0b3476ee1d35cb463990170c982429b.tar.bz2
Mac: UI tweaks for task manager.
Nib change: Reduce row height, make scrollbars smaller. Make text in task manager table slightly smaller. Show in decimal digit for %cpu. Show memory in KB/MB, not always in K. Change update frequency from 1s to 2s to match Activity Monitor's default. (all mac-only. ui team is fine with this.) Finally, turn taskman on. BUG=13156 TEST=Open task manager, look at it. Should look & feel similar to Activity Monitor. Review URL: http://codereview.chromium.org/536038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/string_util_unittest.cc')
-rw-r--r--base/string_util_unittest.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/base/string_util_unittest.cc b/base/string_util_unittest.cc
index 7e3062a..2c1f484 100644
--- a/base/string_util_unittest.cc
+++ b/base/string_util_unittest.cc
@@ -326,10 +326,10 @@ TEST(StringUtilTest, GetByteDisplayUnits) {
} cases[] = {
{0, DATA_UNITS_BYTE},
{512, DATA_UNITS_BYTE},
- {10*1024, DATA_UNITS_KILOBYTE},
- {10*1024*1024, DATA_UNITS_MEGABYTE},
- {10LL*1024*1024*1024, DATA_UNITS_GIGABYTE},
- {~(1LL<<63), DATA_UNITS_GIGABYTE},
+ {10*1024, DATA_UNITS_KIBIBYTE},
+ {10*1024*1024, DATA_UNITS_MEBIBYTE},
+ {10LL*1024*1024*1024, DATA_UNITS_GIBIBYTE},
+ {~(1LL<<63), DATA_UNITS_GIBIBYTE},
#ifdef NDEBUG
{-1, DATA_UNITS_BYTE},
#endif
@@ -348,18 +348,18 @@ TEST(StringUtilTest, FormatBytes) {
} cases[] = {
{0, DATA_UNITS_BYTE, L"0", L"0 B"},
{512, DATA_UNITS_BYTE, L"512", L"512 B"},
- {512, DATA_UNITS_KILOBYTE, L"0.5", L"0.5 kB"},
- {1024*1024, DATA_UNITS_KILOBYTE, L"1024", L"1024 kB"},
- {1024*1024, DATA_UNITS_MEGABYTE, L"1", L"1 MB"},
- {1024*1024*1024, DATA_UNITS_GIGABYTE, L"1", L"1 GB"},
- {10LL*1024*1024*1024, DATA_UNITS_GIGABYTE, L"10", L"10 GB"},
- {~(1LL<<63), DATA_UNITS_GIGABYTE, L"8589934592", L"8589934592 GB"},
+ {512, DATA_UNITS_KIBIBYTE, L"0.5", L"0.5 kB"},
+ {1024*1024, DATA_UNITS_KIBIBYTE, L"1024", L"1024 kB"},
+ {1024*1024, DATA_UNITS_MEBIBYTE, L"1", L"1 MB"},
+ {1024*1024*1024, DATA_UNITS_GIBIBYTE, L"1", L"1 GB"},
+ {10LL*1024*1024*1024, DATA_UNITS_GIBIBYTE, L"10", L"10 GB"},
+ {~(1LL<<63), DATA_UNITS_GIBIBYTE, L"8589934592", L"8589934592 GB"},
// Make sure the first digit of the fractional part works.
- {1024*1024 + 103, DATA_UNITS_KILOBYTE, L"1024.1", L"1024.1 kB"},
- {1024*1024 + 205 * 1024, DATA_UNITS_MEGABYTE, L"1.2", L"1.2 MB"},
- {1024*1024*1024 + (927 * 1024*1024), DATA_UNITS_GIGABYTE,
+ {1024*1024 + 103, DATA_UNITS_KIBIBYTE, L"1024.1", L"1024.1 kB"},
+ {1024*1024 + 205 * 1024, DATA_UNITS_MEBIBYTE, L"1.2", L"1.2 MB"},
+ {1024*1024*1024 + (927 * 1024*1024), DATA_UNITS_GIBIBYTE,
L"1.9", L"1.9 GB"},
- {10LL*1024*1024*1024, DATA_UNITS_GIGABYTE, L"10", L"10 GB"},
+ {10LL*1024*1024*1024, DATA_UNITS_GIBIBYTE, L"10", L"10 GB"},
#ifdef NDEBUG
{-1, DATA_UNITS_BYTE, L"", L""},
#endif