git cl format the final third of the net/base directory

net/base/net_string_util_icu_alternatives_android.cc

Index: net/base/net_string_util_icu_alternatives_android.cc
diff --git a/net/base/net_string_util_icu_alternatives_android.cc b/net/base/net_string_util_icu_alternatives_android.cc
index ca0e7f0315db7677a924b825495b0d27fbdb2df3..f90fbb99577282e6052fd26ed3f78971d7d84d05 100644
--- a/net/base/net_string_util_icu_alternatives_android.cc
+++ b/net/base/net_string_util_icu_alternatives_android.cc
@@ -26,16 +26,16 @@ ScopedJavaLocalRef<jstring> ConvertToJstring(const std::string& text,
   base::android::ScopedJavaLocalRef<jstring> java_charset =
       base::android::ConvertUTF8ToJavaString(env, base::StringPiece(charset));
   ScopedJavaLocalRef<jstring> java_result =
-      android::Java_NetStringUtil_convertToUnicode(env, java_byte_buffer.obj(),
-                                                   java_charset.obj());
+      android::Java_NetStringUtil_convertToUnicode(
+          env, java_byte_buffer.obj(), java_charset.obj());
   return java_result;
 }
 
 // Attempts to convert |text| encoded in |charset| to a jstring (Java unicode
 // string) and then normalizes the string.  Returns the result jstring, or NULL
 // on failure.
-ScopedJavaLocalRef<jstring> ConvertToNormalizedJstring(
-    const std::string& text, const char* charset) {
+ScopedJavaLocalRef<jstring> ConvertToNormalizedJstring(const std::string& text,
+                                                       const char* charset) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_byte_buffer(
       env,
@@ -51,7 +51,8 @@ ScopedJavaLocalRef<jstring> ConvertToNormalizedJstring(
 // Converts |text| encoded in |charset| to a jstring (Java unicode string).
 // Any characters that can not be converted are replaced with U+FFFD.
 ScopedJavaLocalRef<jstring> ConvertToJstringWithSubstitutions(
-    const std::string& text, const char* charset) {
+    const std::string& text,
+    const char* charset) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_byte_buffer(
       env,
@@ -68,7 +69,8 @@ ScopedJavaLocalRef<jstring> ConvertToJstringWithSubstitutions(
 
 const char* const kCharsetLatin1 = "ISO-8859-1";
 
-bool ConvertToUtf8(const std::string& text, const char* charset,
+bool ConvertToUtf8(const std::string& text,
+                   const char* charset,
                    std::string* output) {
   output->clear();
   ScopedJavaLocalRef<jstring> java_result = ConvertToJstring(text, charset);
@@ -78,18 +80,20 @@ bool ConvertToUtf8(const std::string& text, const char* charset,
   return true;
 }
 
-bool ConvertToUtf8AndNormalize(const std::string& text, const char* charset,
+bool ConvertToUtf8AndNormalize(const std::string& text,
+                               const char* charset,
                                std::string* output) {
   output->clear();
-  ScopedJavaLocalRef<jstring> java_result = ConvertToNormalizedJstring(
-      text, charset);
+  ScopedJavaLocalRef<jstring> java_result =
+      ConvertToNormalizedJstring(text, charset);
   if (java_result.is_null())
     return false;
   *output = base::android::ConvertJavaStringToUTF8(java_result);
   return true;
 }
 
-bool ConvertToUTF16(const std::string& text, const char* charset,
+bool ConvertToUTF16(const std::string& text,
+                    const char* charset,
                     base::string16* output) {
   output->clear();
   ScopedJavaLocalRef<jstring> java_result = ConvertToJstring(text, charset);
@@ -104,7 +108,7 @@ bool ConvertToUTF16WithSubstitutions(const std::string& text,
                                      base::string16* output) {
   output->clear();
   ScopedJavaLocalRef<jstring> java_result =
-     ConvertToJstringWithSubstitutions(text, charset);
+      ConvertToJstringWithSubstitutions(text, charset);
   if (java_result.is_null())
     return false;
   *output = base::android::ConvertJavaStringToUTF16(java_result);