Merge branch '26.eap' into santo/26.eap11/user-agent-os1

Author: santoshmahto7

cobalt/app/cobalt.cc

@@ -198,7 +198,6 @@ void SbEventHandle(const SbEvent* event) {
       }
       break;
     }
-    case kSbEventTypeVerticalSync:
     case kSbEventTypeScheduled:
     case kSbEventTypeWindowSizeChanged:
       CHECK(g_platform_event_source);

cobalt/browser/h5vcc_metrics/public/mojom/h5vcc_metrics.mojom

@@ -29,5 +29,5 @@ interface H5vccMetrics {
 
   [Sync] Enable(bool enable) => ();
   SetMetricEventInterval(uint64 interval_seconds) => ();
-  RequestHistograms() => (string histograms_json);
+  RequestHistograms() => (string histograms_base64);
 };

cobalt/common/libc/locale/lconv_support.cc

@@ -310,12 +310,16 @@ std::string GetGroupingString(const icu::DecimalFormat* formatter) {
 }
 }  //  namespace
 
-// Helper function to set an LconvImpl to the default C lconv.
-void LconvImpl::ResetToC() {
+// Resets the LconvImpl's LC_NUMERIC values to the C/POSIX locale values.
+void LconvImpl::ResetNumericToC() {
   stored_decimal = ".";
   stored_thousands = "";
   stored_grouping = "";
+  current_numeric_locale = "C";
+}
 
+// Resets the LconvImpl's LC_MONETARY values to the C/POSIX locale values.
+void LconvImpl::ResetMonetaryToC() {
   stored_mon_decimal = "";
   stored_mon_thousands_sep = "";
   stored_mon_grouping = "";
@@ -351,7 +355,6 @@ void LconvImpl::ResetToC() {
   result.negative_sign = const_cast<char*>(stored_neg_sign.c_str());
   result.currency_symbol = const_cast<char*>(stored_currency_sym.c_str());
   result.int_curr_symbol = const_cast<char*>(stored_int_curr_sym.c_str());
-  current_numeric_locale = "C";
   current_monetary_locale = "C";
 }
 

cobalt/common/libc/locale/lconv_support.h

@@ -34,9 +34,13 @@ struct LconvImpl {
   std::string current_numeric_locale;
   std::string current_monetary_locale;
 
-  LconvImpl() { ResetToC(); }
+  LconvImpl() {
+    ResetNumericToC();
+    ResetMonetaryToC();
+  }
 
-  void ResetToC();
+  void ResetNumericToC();
+  void ResetMonetaryToC();
 };
 
 // Updates all lconv values tied to the LC_NUMERIC locale for a given LconvImpl

cobalt/common/libc/locale/lconv_support_test.cc

@@ -26,7 +26,10 @@ namespace {
 // specification of these values.
 class LconvSupportTest : public ::testing::Test {
  protected:
-  void SetUp() override { lconv_.ResetToC(); }
+  void SetUp() override {
+    lconv_.ResetNumericToC();
+    lconv_.ResetMonetaryToC();
+  }
 
   LconvImpl lconv_;
 };

cobalt/common/libc/locale/locale.cc

@@ -223,19 +223,25 @@ struct lconv* localeconv(void) {
   std::string numeric_locale = current_loc->categories[LC_NUMERIC];
   std::string monetary_locale = current_loc->categories[LC_MONETARY];
 
-  if ((numeric_locale == cobalt::kCLocale ||
-       numeric_locale == cobalt::kPosixLocale) &&
-      (monetary_locale == cobalt::kCLocale ||
-       monetary_locale == cobalt::kPosixLocale)) {
-    current_lconv->ResetToC();
-    return &(current_lconv->result);
+  bool is_c_or_posix_numeric_locale = (numeric_locale == cobalt::kCLocale ||
+                                       numeric_locale == cobalt::kPosixLocale);
+  if (is_c_or_posix_numeric_locale) {
+    current_lconv->ResetNumericToC();
+  } else if (!cobalt::UpdateNumericLconv(numeric_locale, current_lconv)) {
+    SB_LOG(WARNING)
+        << "Failed to retrieve lconv numeric values. Returning C values.";
+    current_lconv->ResetNumericToC();
   }
 
-  if (!cobalt::UpdateNumericLconv(numeric_locale, current_lconv) ||
-      !cobalt::UpdateMonetaryLconv(monetary_locale, current_lconv)) {
-    SB_LOG(WARNING) << "Failed to properly retrieve the updated lconv struct. "
-                       "Returning the C lconv.";
-    current_lconv->ResetToC();
+  bool is_c_or_posix_monetary_locale =
+      (monetary_locale == cobalt::kCLocale ||
+       monetary_locale == cobalt::kPosixLocale);
+  if (is_c_or_posix_monetary_locale) {
+    current_lconv->ResetMonetaryToC();
+  } else if (!cobalt::UpdateMonetaryLconv(monetary_locale, current_lconv)) {
+    SB_LOG(WARNING)
+        << "Failed to retrieve lconv monetary values. Returning C values.";
+    current_lconv->ResetMonetaryToC();
   }
 
   return &(current_lconv->result);
@@ -268,8 +274,7 @@ char* nl_langinfo_l(nl_item item, locale_t locale) {
     case AM_STR:
     case PM_STR:
       langinfo_buffer = cobalt::GetLocalizedDateSymbol(
-          cur_locale->categories[LC_TIME], cobalt::TimeNameType::kAmPm,
-          item - AM_STR);
+          cur_locale->categories[LC_TIME], cobalt::TimeNameType::kAmPm, item);
       break;
 
     // Days
@@ -281,8 +286,7 @@ char* nl_langinfo_l(nl_item item, locale_t locale) {
     case DAY_6:
     case DAY_7:
       langinfo_buffer = cobalt::GetLocalizedDateSymbol(
-          cur_locale->categories[LC_TIME], cobalt::TimeNameType::kDay,
-          item - DAY_1);
+          cur_locale->categories[LC_TIME], cobalt::TimeNameType::kDay, item);
       break;
 
     // Abbreviated days
@@ -295,7 +299,7 @@ char* nl_langinfo_l(nl_item item, locale_t locale) {
     case ABDAY_7:
       langinfo_buffer = cobalt::GetLocalizedDateSymbol(
           cur_locale->categories[LC_TIME], cobalt::TimeNameType::kAbbrevDay,
-          item - ABDAY_1);
+          item);
       break;
 
     // Months
@@ -312,8 +316,7 @@ char* nl_langinfo_l(nl_item item, locale_t locale) {
     case MON_11:
     case MON_12:
       langinfo_buffer = cobalt::GetLocalizedDateSymbol(
-          cur_locale->categories[LC_TIME], cobalt::TimeNameType::kMonth,
-          item - MON_1);
+          cur_locale->categories[LC_TIME], cobalt::TimeNameType::kMonth, item);
       break;
 
     // Abbreviated months
@@ -331,7 +334,7 @@ char* nl_langinfo_l(nl_item item, locale_t locale) {
     case ABMON_12:
       langinfo_buffer = cobalt::GetLocalizedDateSymbol(
           cur_locale->categories[LC_TIME], cobalt::TimeNameType::kAbbrevMonth,
-          item - ABMON_1);
+          item);
       break;
     case RADIXCHAR:
     case THOUSEP:

cobalt/common/libc/locale/nl_langinfo_support.cc

@@ -89,6 +89,123 @@ std::string CollapseSpaces(const std::string& input) {
   return result;
 }
 
+// Returns the relevant LC_TIME nl_langinfo string from the C/POSIX locale.
+std::string GetCTimeLanginfo(nl_item item) {
+  switch (item) {
+    // Date and Time Formats
+    case D_T_FMT:
+      return "%a %b %e %H:%M:%S %Y";
+    case D_FMT:
+      return "%m/%d/%y";
+    case T_FMT:
+      return "%H:%M:%S";
+    case T_FMT_AMPM:
+      return "%I:%M:%S %p";
+    case AM_STR:
+      return "AM";
+    case PM_STR:
+      return "PM";
+
+    // Days of the Week (Full)
+    case DAY_1:
+      return "Sunday";
+    case DAY_2:
+      return "Monday";
+    case DAY_3:
+      return "Tuesday";
+    case DAY_4:
+      return "Wednesday";
+    case DAY_5:
+      return "Thursday";
+    case DAY_6:
+      return "Friday";
+    case DAY_7:
+      return "Saturday";
+
+    // Days of the Week (Abbreviated)
+    case ABDAY_1:
+      return "Sun";
+    case ABDAY_2:
+      return "Mon";
+    case ABDAY_3:
+      return "Tue";
+    case ABDAY_4:
+      return "Wed";
+    case ABDAY_5:
+      return "Thu";
+    case ABDAY_6:
+      return "Fri";
+    case ABDAY_7:
+      return "Sat";
+
+    // Months (Full)
+    case MON_1:
+      return "January";
+    case MON_2:
+      return "February";
+    case MON_3:
+      return "March";
+    case MON_4:
+      return "April";
+    case MON_5:
+      return "May";
+    case MON_6:
+      return "June";
+    case MON_7:
+      return "July";
+    case MON_8:
+      return "August";
+    case MON_9:
+      return "September";
+    case MON_10:
+      return "October";
+    case MON_11:
+      return "November";
+    case MON_12:
+      return "December";
+
+    // Months (Abbreviated)
+    case ABMON_1:
+      return "Jan";
+    case ABMON_2:
+      return "Feb";
+    case ABMON_3:
+      return "Mar";
+    case ABMON_4:
+      return "Apr";
+    case ABMON_5:
+      return "May";
+    case ABMON_6:
+      return "Jun";
+    case ABMON_7:
+      return "Jul";
+    case ABMON_8:
+      return "Aug";
+    case ABMON_9:
+      return "Sep";
+    case ABMON_10:
+      return "Oct";
+    case ABMON_11:
+      return "Nov";
+    case ABMON_12:
+      return "Dec";
+
+    default:
+      return "";
+  }
+}
+
+// Returns the relevant LC_NUMERIC nl_langinfo string from the C/POSIX locale.
+std::string GetCNumericLanginfo(nl_item item) {
+  switch (item) {
+    case RADIXCHAR:
+      return ".";
+    case THOUSEP:
+    default:
+      return "";
+  }
+}
+
 // Convenience method to convert a POSIX locale string to the ICU string format.
 // Some POSIX strings like sr_RS@latin require special handling to be fully
 // translated from POSIX to ICU.
@@ -342,7 +459,10 @@ icu::UnicodeString GetPatternFromSkeleton(const std::string& locale_id,
 
 std::string GetLocalizedDateSymbol(const std::string& locale,
                                    TimeNameType type,
-                                   int index) {
+                                   nl_item item) {
+  if (locale == cobalt::kCLocale || locale == cobalt::kPosixLocale) {
+    return GetCTimeLanginfo(item);
+  }
   std::string result;
 
   UErrorCode status = U_ZERO_ERROR;
@@ -354,35 +474,44 @@ std::string GetLocalizedDateSymbol(const std::string& locale,
   }
 
   int count = 0;
+  int index;
 
   switch (type) {
     case TimeNameType::kDay:
+      index = item - DAY_1;
       result =
           ToUtf8(syms.getWeekdays(count, icu::DateFormatSymbols::STANDALONE,
                                   icu::DateFormatSymbols::WIDE)[index + 1]);
       break;
     case TimeNameType::kAbbrevDay:
+      index = item - ABDAY_1;
       result = ToUtf8(
           syms.getWeekdays(count, icu::DateFormatSymbols::STANDALONE,
                            icu::DateFormatSymbols::ABBREVIATED)[index + 1]);
       break;
     case TimeNameType::kMonth:
+      index = item - MON_1;
       result = ToUtf8(syms.getMonths(count, icu::DateFormatSymbols::STANDALONE,
                                      icu::DateFormatSymbols::WIDE)[index]);
       break;
     case TimeNameType::kAbbrevMonth:
+      index = item - ABMON_1;
       result =
           ToUtf8(syms.getMonths(count, icu::DateFormatSymbols::STANDALONE,
                                 icu::DateFormatSymbols::ABBREVIATED)[index]);
       break;
     case TimeNameType::kAmPm:
+      index = item - AM_STR;
       result = ToUtf8(syms.getAmPmStrings(count)[index]);
   }
 
   return result;
 }
 
 std::string NlGetNumericData(const std::string& locale, nl_item type) {
+  if (locale == cobalt::kCLocale || locale == cobalt::kPosixLocale) {
+    return GetCNumericLanginfo(type);
+  }
   std::string result;
 
   UErrorCode status = U_ZERO_ERROR;
@@ -412,6 +541,10 @@ std::string NlGetNumericData(const std::string& locale, nl_item type) {
 }
 
 std::string GetPosixPattern(const std::string& locale, nl_item item) {
+  if (locale == cobalt::kCLocale || locale == cobalt::kPosixLocale) {
+    return GetCTimeLanginfo(item);
+  }
+
   icu::UnicodeString icu_pattern;
 
   // For |D_FMT| and |T_FMT|, ICU has stored data for each locale that closely

cobalt/common/libc/locale/nl_langinfo_support.h

@@ -30,7 +30,7 @@ enum class TimeNameType { kDay, kAbbrevDay, kMonth, kAbbrevMonth, kAmPm };
 // TimeNameType. This includes |DAY*|, |ABDAY*|, |AM/PM_STR|, |MON*|, |ABMON*|.
 std::string GetLocalizedDateSymbol(const std::string& locale,
                                    TimeNameType type,
-                                   int index);
+                                   nl_item item);
 
 // Will retrieve the corresponding Numeric data for a given locale. This mainly
 // supports the |RADIXCHAR| and |THOUSEP| nl_items.

cobalt/updater/configurator.cc

@@ -303,7 +303,7 @@ std::string Configurator::GetAppGuidHelper(const std::string& updater_channel,
   auto it = kChannelAndSbVersionToOmahaIdMap.find(channel +
                                                   std::to_string(sb_version));
   if (it != kChannelAndSbVersionToOmahaIdMap.end()) {
-    return it->second;
+    return std::string(it->second);
   }
   // All undefined channel requests go to the default EAP config.
   LOG(INFO) << "Configurator::GetAppGuidHelper updater channel and starboard "

cobalt/updater/one_app_only_sandbox.cc

@@ -226,7 +226,6 @@ void SbEventHandle(const SbEvent* event) {
       }
       break;
     }
-    case kSbEventTypeVerticalSync:
     case kSbEventTypeScheduled:
     case kSbEventTypeWindowSizeChanged:
       if (g_platform_event_source) {