Update to newer network service implementation and mojoms from monet

sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java

 // Copyright 2015 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.
 
 package org.domokit.oknet;
 
 import android.util.Log;
 
 import com.squareup.okhttp.Call;
 import com.squareup.okhttp.Callback;
 import com.squareup.okhttp.Headers;
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
 import com.squareup.okhttp.ResponseBody;
 
 import org.chromium.base.TraceEvent;
 import org.chromium.mojo.system.Core;
 import org.chromium.mojo.system.DataPipe;
 import org.chromium.mojo.system.MojoException;
 import org.chromium.mojo.system.MojoResult;
 import org.chromium.mojo.system.Pair;
+import org.chromium.mojom.mojo.HttpHeader;
 import org.chromium.mojom.mojo.NetworkError;
 import org.chromium.mojom.mojo.UrlLoader;
 import org.chromium.mojom.mojo.UrlLoaderStatus;
 import org.chromium.mojom.mojo.UrlRequest;
 import org.chromium.mojom.mojo.UrlResponse;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.concurrent.Executor;
@@ skipping 79 matching lines @@
     @Override
     public void start(UrlRequest request, StartResponse callback) {
         TraceEvent.startAsync("UrlLoaderImpl", mTracingId);
         mIsLoading = true;
         mError = null;
 
         Request.Builder builder =
                 new Request.Builder().url(request.url).method(request.method, null);
 
         if (request.headers != null) {
-            for (String header : request.headers) {
-                String[] parts = header.split(":");
-                String name = parts[0].trim();
-                String value = parts.length > 1 ? parts[1].trim() : "";
-                builder.addHeader(name, value);
+            for (HttpHeader header : request.headers) {
+                builder.addHeader(header.name, header.value);
             }
         }
 
         // TODO(abarth): body, responseBodyBufferSize, autoFollowRedirects, bypassCache.
         final StartResponse responseCallback = callback;
         Call call = mClient.newCall(builder.build());
         call.enqueue(new Callback() {
             @Override
             public void onFailure(Request request, IOException e) {
                 Log.w(TAG, "Network failure loading " + request.urlString());
@@ skipping 15 matching lines @@
                 urlResponse.url = response.request().urlString();
                 urlResponse.statusCode = response.code();
                 urlResponse.statusLine = response.message();
 
                 if (urlResponse.statusCode >= 400) {
                     Log.w(TAG, "Failed to load: " + urlResponse.url + " ("
                             + urlResponse.statusCode + ")");
                 }
 
                 Headers headers = response.headers();
-                urlResponse.headers = new String[headers.size()];
+                urlResponse.headers = new HttpHeader[headers.size()];
                 for (int i = 0; i < headers.size(); ++i) {
-                    String name = headers.name(i);
-                    String value = headers.value(i);
-                    urlResponse.headers[i] = name + ": " + value;
+                    HttpHeader header = new HttpHeader();
+                    header.name = headers.name(i);
+                    header.value = headers.value(i);
+                    urlResponse.headers[i] = header;
                 }
 
                 ResponseBody body = response.body();
                 MediaType mediaType = body.contentType();
                 if (mediaType != null) {
                     urlResponse.mimeType = mediaType.type() + "/" + mediaType.subtype();
                     Charset charset = mediaType.charset();
-                    if (charset != null)
+                    if (charset != null) {
                         urlResponse.charset = charset.displayName();
+                    }
                 }
 
                 Pair<DataPipe.ProducerHandle, DataPipe.ConsumerHandle> handles =
                         mCore.createDataPipe(null);
                 DataPipe.ProducerHandle producerHandle = handles.first;
                 DataPipe.ConsumerHandle consumerHandle = handles.second;
                 urlResponse.body = consumerHandle;
                 responseCallback.call(urlResponse);
                 mExecutor.execute(new CopyToPipeJob(body, producerHandle));
             }
         });
     }
 
     @Override
     public void followRedirect(FollowRedirectResponse callback) {
         // TODO(abarth): Implement redirects.
         callback.call(new UrlResponse());
     }
 
     @Override
     public void queryStatus(QueryStatusResponse callback) {
         UrlLoaderStatus status = new UrlLoaderStatus();
         status.error = mError;
         status.isLoading = mIsLoading;
         callback.call(status);
     }
 }