Use "second" instead of "sec" in TimeRemainingLong()

This makes more sense, also it is consistent with
TimeDurationLong().

At that occasion, fix bad grammar in ui_strings.grd.

Unit testing is provisional and will be adjusted once
https://codereview.chromium.org/139413005/ has landed.

BUG=340113
TEST=full unit test coverage

Review URL: https://codereview.chromium.org/150573011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249335 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 37 insertions, 5 deletions

diff --git a/ui/base/l10n/time_format.cc b/ui/base/l10n/time_format.cc
index 6c191eb..27d5b71 100644
--- a/ui/base/l10n/time_format.cc
+++ b/ui/base/l10n/time_format.cc
@@ -83,9 +83,9 @@ static const MessageIDs kTimeRemainingMessageIDs = { {
 
 static const MessageIDs kTimeRemainingLongMessageIDs = { {
   {
-    IDS_TIME_REMAINING_SECS_DEFAULT, IDS_TIME_REMAINING_SEC_SINGULAR,
-    IDS_TIME_REMAINING_SECS_ZERO, IDS_TIME_REMAINING_SECS_TWO,
-    IDS_TIME_REMAINING_SECS_FEW, IDS_TIME_REMAINING_SECS_MANY
+    IDS_TIME_REMAINING_LONG_SECS_DEFAULT, IDS_TIME_REMAINING_LONG_SEC_SINGULAR,
+    IDS_TIME_REMAINING_LONG_SECS_ZERO, IDS_TIME_REMAINING_LONG_SECS_TWO,
+    IDS_TIME_REMAINING_LONG_SECS_FEW, IDS_TIME_REMAINING_LONG_SECS_MANY
   },
   {
     IDS_TIME_REMAINING_LONG_MINS_DEFAULT, IDS_TIME_REMAINING_LONG_MIN_SINGULAR,
diff --git a/ui/base/l10n/time_format.h b/ui/base/l10n/time_format.h
index c9c73ee..1306bf0 100644
--- a/ui/base/l10n/time_format.h
+++ b/ui/base/l10n/time_format.h
@@ -29,8 +29,6 @@ class UI_BASE_EXPORT TimeFormat {
   static base::string16 TimeRemaining(const base::TimeDelta& delta);
 
   // Returns times in remaining-long-format: "3 minutes left", "2 days left".
-  // Currently, this only affects the minutes in long format, the rest
-  // of the time units are formatted the same as TimeRemaining does.
   static base::string16 TimeRemainingLong(const base::TimeDelta& delta);
 
   // Returns times in short-format: "3 mins", "2 days".
diff --git a/ui/base/l10n/time_format_unittest.cc b/ui/base/l10n/time_format_unittest.cc
index 60ad3b4..4d6dbb7 100644
--- a/ui/base/l10n/time_format_unittest.cc
+++ b/ui/base/l10n/time_format_unittest.cc
@@ -72,6 +72,40 @@ TEST_F(TimeFormatTest, FormatTime) {
   TestTimeFormats(1 * one_day + 12 * one_hour, "2 days");
 }
 
+void TestRemainingLong(const TimeDelta& delta, const std::string& expected) {
+  EXPECT_EQ(TimeFormat::TimeRemainingLong(delta), ASCIIToUTF16(expected));
+}
+
+TEST_F(TimeFormatTest, TimeRemainingLong) {
+  const TimeDelta one_day(TimeDelta::FromDays(1));
+  const TimeDelta one_hour(TimeDelta::FromHours(1));
+  const TimeDelta one_min(TimeDelta::FromMinutes(1));
+  const TimeDelta one_second(TimeDelta::FromSeconds(1));
+  const TimeDelta one_millisecond(TimeDelta::FromMilliseconds(1));
+  const TimeDelta zero(TimeDelta::FromMilliseconds(0));
+
+  TestRemainingLong(zero, "0 seconds left");
+  TestRemainingLong(499 * one_millisecond, "0 seconds left");
+  TestRemainingLong(500 * one_millisecond, "1 second left");
+  TestRemainingLong(one_second + 499 * one_millisecond, "1 second left");
+  TestRemainingLong(one_second + 500 * one_millisecond, "2 seconds left");
+  TestRemainingLong(59 * one_second + 499 * one_millisecond, "59 seconds left");
+  TestRemainingLong(59 * one_second + 500 * one_millisecond, "1 minute left");
+  TestRemainingLong(one_min + 30 * one_second - one_millisecond,
+                    "1 minute left");
+  TestRemainingLong(one_min + 30 * one_second, "2 minutes left");
+  TestRemainingLong(59 * one_min + 30 * one_second - one_millisecond,
+                    "59 minutes left");
+  TestRemainingLong(59 * one_min + 30 * one_second, "1 hour left");
+  TestRemainingLong(one_hour + 30 * one_min - one_millisecond, "1 hour left");
+  TestRemainingLong(one_hour + 30 * one_min, "2 hours left");
+  TestRemainingLong(23 * one_hour + 30 * one_min - one_millisecond,
+                    "23 hours left");
+  TestRemainingLong(23 * one_hour + 30 * one_min, "1 day left");
+  TestRemainingLong(one_day + 12 * one_hour - one_millisecond, "1 day left");
+  TestRemainingLong(one_day + 12 * one_hour, "2 days left");
+}
+
 // crbug.com/159388: This test fails when daylight savings time ends.
 TEST_F(TimeFormatTest, RelativeDate) {
   base::Time now = base::Time::Now();