Update from https://crrev.com/309415

base/strings/stringprintf.h

Index: base/strings/stringprintf.h
diff --git a/base/strings/stringprintf.h b/base/strings/stringprintf.h
index d924a0e59f21706afb8bf9e749e1e5d9d883f864..523f7ee55bf3693895b2d2d43d73f1c50565cb12 100644
--- a/base/strings/stringprintf.h
+++ b/base/strings/stringprintf.h
@@ -17,8 +17,7 @@ namespace base {
 // Return a C++ string given printf-like input.
 BASE_EXPORT std::string StringPrintf(const char* format, ...)
     PRINTF_FORMAT(1, 2) WARN_UNUSED_RESULT;
-// OS_ANDROID's libc does not support wchar_t, so several overloads are omitted.
-#if !defined(OS_ANDROID)
+#if defined(OS_WIN)
 BASE_EXPORT std::wstring StringPrintf(const wchar_t* format, ...)
     WPRINTF_FORMAT(1, 2) WARN_UNUSED_RESULT;
 #endif
@@ -31,7 +30,7 @@ BASE_EXPORT std::string StringPrintV(const char* format, va_list ap)
 BASE_EXPORT const std::string& SStringPrintf(std::string* dst,
                                              const char* format, ...)
     PRINTF_FORMAT(2, 3);
-#if !defined(OS_ANDROID)
+#if defined(OS_WIN)
 BASE_EXPORT const std::wstring& SStringPrintf(std::wstring* dst,
                                               const wchar_t* format, ...)
     WPRINTF_FORMAT(2, 3);
@@ -40,9 +39,7 @@ BASE_EXPORT const std::wstring& SStringPrintf(std::wstring* dst,
 // Append result to a supplied string.
 BASE_EXPORT void StringAppendF(std::string* dst, const char* format, ...)
     PRINTF_FORMAT(2, 3);
-#if !defined(OS_ANDROID)
-// TODO(evanm): this is only used in a few places in the code;
-// replace with string16 version.
+#if defined(OS_WIN)
 BASE_EXPORT void StringAppendF(std::wstring* dst, const wchar_t* format, ...)
     WPRINTF_FORMAT(2, 3);
 #endif
@@ -51,7 +48,7 @@ BASE_EXPORT void StringAppendF(std::wstring* dst, const wchar_t* format, ...)
 // string.  All other routines are just convenience wrappers around it.
 BASE_EXPORT void StringAppendV(std::string* dst, const char* format, va_list ap)
     PRINTF_FORMAT(2, 0);
-#if !defined(OS_ANDROID)
+#if defined(OS_WIN)
 BASE_EXPORT void StringAppendV(std::wstring* dst,
                                const wchar_t* format, va_list ap)
     WPRINTF_FORMAT(2, 0);