Add support for localized time strings with two units, eg. "2 hours 17 minutes"

chrome/common/time_format_browsertest.cc

Index: chrome/common/time_format_browsertest.cc
diff --git a/chrome/common/time_format_browsertest.cc b/chrome/common/time_format_browsertest.cc
index 6b6fbf470dc74c36394e671744433d857d4183c9..17b9d3af3ecb4ed8dc3ad17c2e9072789f61b69b 100644
--- a/chrome/common/time_format_browsertest.cc
+++ b/chrome/common/time_format_browsertest.cc
@@ -35,6 +35,7 @@ IN_PROC_BROWSER_TEST_F(TimeFormatBrowserTest, DecimalPointNotDot) {
   // http://crbug.com/60476
 
   base::string16 one_min =
-      ui::TimeFormat::TimeDurationShort(TimeDelta::FromMinutes(1));
+      ui::TimeFormat::Simple(ui::TimeFormat::kDuration, ui::TimeFormat::kShort,
+                             TimeDelta::FromMinutes(1));
   EXPECT_EQ(base::ASCIIToUTF16("1 min"), one_min);
 }