[Cronet] Make metrics reporting happen after terminal callbacks.

components/cronet/android/cronet_url_request_adapter.h

 // 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.
 
 #ifndef COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_ADAPTER_H_
 #define COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_ADAPTER_H_
 
 #include <jni.h>
 
 #include <memory>
@@ skipping 114 matching lines @@
   void GetStatusOnNetworkThread(
       const base::android::ScopedJavaGlobalRef<jobject>& jstatus_listener_ref)
       const;
   // Gets response headers on network thread.
   base::android::ScopedJavaLocalRef<jobjectArray> GetResponseHeaders(
       JNIEnv* env);
   void FollowDeferredRedirectOnNetworkThread();
   void ReadDataOnNetworkThread(
       scoped_refptr<IOBufferWithByteBuffer> read_buffer,
       int buffer_size);
-  void DestroyOnNetworkThread(bool send_on_canceled);
+  void DestroyOnNetworkThread(bool jsend_on_canceled);
 
   // Report error and cancel request_adapter.
   void ReportError(net::URLRequest* request, int net_error);
   // Reports metrics collected to the Java layer
-  void MaybeReportMetrics(JNIEnv* env) const;
+  void MaybeReportMetrics(JNIEnv* env);
 
   CronetURLRequestContextAdapter* context_;
 
   // Java object that owns this CronetURLRequestContextAdapter.
   base::android::ScopedJavaGlobalRef<jobject> owner_;
 
   const GURL initial_url_;
   const net::RequestPriority initial_priority_;
   std::string initial_method_;
   int load_flags_;
   net::HttpRequestHeaders initial_request_headers_;
   std::unique_ptr<net::UploadDataStream> upload_;
 
   scoped_refptr<IOBufferWithByteBuffer> read_buffer_;
   std::unique_ptr<net::URLRequest> url_request_;
 
-  // Whether detailed metrics should be collected and reported to Java for this
-  // request.
+  // Whether detailed metrics should be collected and reported to Java.
   const bool enable_metrics_;
+  // Whether metrics have been reported to Java.
+  bool metrics_reported_;
 
   DISALLOW_COPY_AND_ASSIGN(CronetURLRequestAdapter);
 };
 
 }  // namespace cronet
 
 #endif  // COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_ADAPTER_H_