[Cronet] Delay StartNetLog and StopNetLog until native request context is initialized

components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java

 // Copyright 2014 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.chromium.net;
 
+import android.content.Context;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.PathUtils;
 import org.chromium.base.test.util.Feature;
 
 import java.io.File;
 import java.util.HashMap;
 
 /**
  * Example test that just starts the cronet sample.
@@ skipping 32 matching lines @@
                                                              commandLineArgs);
 
         // Make sure that the URL is set as expected.
         assertEquals(URL, activity.getUrl());
         assertEquals(200, activity.getHttpStatusCode());
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testNetLog() throws Exception {
-        CronetTestActivity activity = launchCronetTestApp();
-        File directory = new File(PathUtils.getDataDirectory(
-                getInstrumentation().getTargetContext()));
+        Context context = getInstrumentation().getTargetContext();
+        File directory = new File(PathUtils.getDataDirectory(context));
         File file = File.createTempFile("cronet", "json", directory);
-        activity.mRequestFactory.startNetLogToFile(file.getPath());
+        HttpUrlRequestFactory factory = HttpUrlRequestFactory.createFactory(
+                context,
+                new UrlRequestContextConfig().setLibraryName("cronet_tests"));
+        // Start NetLog immediately after the request context is created to make
+        // sure that the call won't crash the app even when the native request
+        // context is not fully initialized. See crbug.com/470196.
+        factory.startNetLogToFile(file.getPath());
         // Starts a request.
-        activity.startWithURL(URL);
-        Thread.sleep(5000);
-        activity.mRequestFactory.stopNetLog();
+        HashMap<String, String> headers = new HashMap<String, String>();
+        TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();
+        HttpUrlRequest request = factory.createRequest(
+                URL, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
+        request.start();
+        listener.blockForComplete();
+        factory.stopNetLog();
         assertTrue(file.exists());
         assertTrue(file.length() != 0);
         assertTrue(file.delete());
         assertTrue(!file.exists());
     }
 
     static class BadHttpUrlRequestListener extends TestHttpUrlRequestListener {
         static final String THROW_TAG = "BadListener";
 
         public BadHttpUrlRequestListener() {
@@ skipping 120 matching lines @@
                 URL, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
         request.setHttpMethod("HEAD");
         request.start();
         listener.blockForComplete();
         assertEquals(200, listener.mHttpStatusCode);
         // HEAD requests do not get any response data and Content-Length must be
         // ignored.
         assertEquals(0, listener.mResponseAsBytes.length);
     }
 }