Improve and fix counter texts

components/browsing_data/core/browsing_data_utils_unittest.cc

 // Copyright 2016 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 "components/browsing_data/core/browsing_data_utils.h"
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 45 matching lines @@
 
   // Test all configurations of zero and nonzero partial results for datatypes.
   // Test singular and plural for each datatype.
   const struct TestCase {
     int num_credit_cards;
     int num_addresses;
     int num_suggestions;
     bool sync_enabled;
     std::string expected_output;
   } kTestCases[] = {
-      {0, 0, 0, false, "none"},
-      {0, 0, 0, true, "none"},
+      {0, 0, 0, false, "None"},
+      {0, 0, 0, true, "None"},
       {1, 0, 0, false, "1 credit card"},
       {0, 5, 0, false, "5 addresses"},
       {0, 0, 1, false, "1 suggestion"},
       {0, 0, 2, false, "2 suggestions"},
       {0, 0, 2, true, "2 suggestions (synced)"},
       {4, 7, 0, false, "4 credit cards, 7 addresses"},
       {4, 7, 0, true, "4 credit cards, 7 addresses (synced)"},
       {3, 0, 9, false, "3 credit cards, 9 other suggestions"},
       {0, 1, 1, false, "1 address, 1 other suggestion"},
       {9, 6, 3, false, "9 credit cards, 6 addresses, 3 others"},
@@ skipping 22 matching lines @@
   scoped_refptr<password_manager::TestPasswordStore> store(
       new password_manager::TestPasswordStore());
   browsing_data::PasswordsCounter counter(
       scoped_refptr<password_manager::PasswordStore>(store), nullptr);
 
   const struct TestCase {
     int num_passwords;
     int is_synced;
     std::string expected_output;
   } kTestCases[] = {
-      {0, false, "none"},        {0, true, "none"},
+      {0, false, "None"},        {0, true, "None"},
       {1, false, "1 password"},  {1, true, "1 password (synced)"},
       {5, false, "5 passwords"}, {5, true, "5 passwords (synced)"},
   };
 
   for (const TestCase& test_case : kTestCases) {
     browsing_data::BrowsingDataCounter::SyncResult result(
         &counter, test_case.num_passwords, test_case.is_synced);
     SCOPED_TRACE(base::StringPrintf("Test params: %d password(s), %d is_synced",
                                     test_case.num_passwords,
                                     test_case.is_synced));
@@ skipping 24 matching lines @@
   prefs()->SetInteger(kDeleteTimePeriod, 100);
 
   // After the first migration all settings should stay the same if the
   // migration is executed again.
   browsing_data::MigratePreferencesToBasic(prefs());
   EXPECT_TRUE(prefs()->GetBoolean(kDeleteBrowsingHistoryBasic));
   EXPECT_FALSE(prefs()->GetBoolean(kDeleteCookiesBasic));
   EXPECT_FALSE(prefs()->GetBoolean(kDeleteCacheBasic));
   EXPECT_EQ(42, prefs()->GetInteger(kDeleteTimePeriodBasic));
 }