Fix chromium webview build break

content/renderer/date_time_formatter.cc

 // Copyright (c) 2013 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 "content/renderer/date_time_formatter.h"
 
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeChooserParams.h"
 #include "third_party/icu/public/i18n/unicode/smpdtfmt.h"
 
 
 namespace content {
 
 void DateTimeFormatter::CreatePatternMap() {
   // Initialize all the UI elements with empty patterns,
   // then fill in the ones that are actually date/time inputs and
@@ skipping 27 matching lines @@
     year_(year),
     month_(month),
     day_(day),
     hour_(hour),
     minute_(minute),
     second_(second) {
   CreatePatternMap();
   pattern_ = type_ > 0 && type_ <= ui::TEXT_INPUT_TYPE_MAX ?
       &patterns_[type_] : &patterns_[ui::TEXT_INPUT_TYPE_NONE];
 
-  std::string patt;
-  pattern_->toUTF8String(patt);
   formatted_string_ = FormatString();
 }
 
 DateTimeFormatter::~DateTimeFormatter() {
 }
 
 int DateTimeFormatter::GetYear() const {
   return year_;
 }
 
@@ skipping 33 matching lines @@
   }
 
   std::string result;
   const icu::GregorianCalendar calendar(
       year_, month_, day_, hour_, minute_, second_, success);
   if (success <= U_ZERO_ERROR) {
     UDate time = calendar.getTime(success);
     icu::SimpleDateFormat formatter(*pattern_, success);
     icu::UnicodeString formattedTime;
     formatter.format(time, formattedTime, success);
-    formattedTime.toUTF8String(result);
+    // Android WebView builds with the system ICU which is different
+    // from Chromium's ICU; as such we can't easily get a UTF8 string
+    // from formattedTime but we can go round-the-houses a bit.
+    result = UTF16ToUTF8(string16(formattedTime.getBuffer(),
+        static_cast<size_t>(formattedTime.length())));
     if (success <= U_ZERO_ERROR)
       return result;
   }
   LOG(WARNING) << "Calendar not created: error " <<  success;
   return "";
 }
 
 void DateTimeFormatter::ExtractType(
     const WebKit::WebDateTimeChooserParams& source) {
   switch (source.type) {
@@ skipping 34 matching lines @@
     return false;
   }
 
   if (formatted_string_.empty()) {
     ClearAll();
     return true;
   }
 
   UErrorCode success = U_ZERO_ERROR;
   icu::UnicodeString icu_value =
-      icu::UnicodeString::fromUTF8(formatted_string_);
+      icu::UnicodeString::fromUTF8(formatted_string_.c_str());
   if (type_ > 0 && type_ <= ui::TEXT_INPUT_TYPE_MAX) {
     const icu::UnicodeString pattern = patterns_[type_];
     icu::SimpleDateFormat formatter(pattern, success);
     formatter.parse(icu_value, success);
     if (success <= U_ZERO_ERROR) {
       const icu::Calendar* cal = formatter.getCalendar();
       year_ = ExtractValue(cal, UCAL_YEAR);
       month_ = ExtractValue(cal, UCAL_MONTH);
       day_ = ExtractValue(cal, UCAL_DATE);
       hour_ = ExtractValue(cal, UCAL_HOUR_OF_DAY);  // 24h format
       minute_ = ExtractValue(cal, UCAL_MINUTE);
       second_ = ExtractValue(cal, UCAL_SECOND);
     }
   }
 
   return (success <= U_ZERO_ERROR);
 }
 
 void DateTimeFormatter::ClearAll() {
   year_ = 0;
   month_ = 0;
   day_ = 0;
   hour_ = 0;
   minute_ = 0;
   second_ = 0;
 }
 
 }  // namespace content