Cronet API Refactoring

components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequest.java

Index: components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequest.java
diff --git a/components/cronet/android/api/src/org/chromium/net/JavaUrlRequest.java b/components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequest.java
similarity index 98%
rename from components/cronet/android/api/src/org/chromium/net/JavaUrlRequest.java
rename to components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequest.java
index 0e582e476a672b6b3d539df2383cdbc3005418e4..34347890973cb07362000546312a59e76ec9a621 100644
--- a/components/cronet/android/api/src/org/chromium/net/JavaUrlRequest.java
+++ b/components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequest.java
@@ -2,12 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.net;
+package org.chromium.net.impl;
 
 import android.annotation.TargetApi;
 import android.net.TrafficStats;
 import android.os.Build;
-import android.util.Log;
+
+import org.chromium.base.Log;
+import org.chromium.net.InlineExecutionProhibitedException;
+import org.chromium.net.UploadDataProvider;
+import org.chromium.net.UploadDataSink;
+import org.chromium.net.UrlRequestException;
+import org.chromium.net.UrlResponseInfo;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -34,7 +40,7 @@ import java.util.concurrent.atomic.AtomicReference;
  * Pure java UrlRequest, backed by {@link HttpURLConnection}.
  */
 @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) // TrafficStats only available on ICS
-final class JavaUrlRequest implements UrlRequest {
+final class JavaUrlRequest extends UrlRequestBase {
     private static final String X_ANDROID = "X-Android";
     private static final String X_ANDROID_SELECTED_TRANSPORT = "X-Android-Selected-Transport";
     private static final String TAG = "JavaUrlConnection";
@@ -82,7 +88,8 @@ final class JavaUrlRequest implements UrlRequest {
      * risk that we'd get an inconsistent snapshot of both - however, it also happens that this
      * value is only used with the STARTED state, so it's inconsequential.
      */
-    @Status.StatusValues private volatile int mAdditionalStatusDetails = Status.INVALID;
+    @Status.StatusValues
+    private volatile int mAdditionalStatusDetails = Status.INVALID;
 
     /* These change with redirects. */
     private String mCurrentUrl;
@@ -355,7 +362,7 @@ final class JavaUrlRequest implements UrlRequest {
                 @Override
                 public void run() throws Exception {
                     if (mOutputChannel == null) {
-                        mAdditionalStatusDetails = Status.CONNECTING;
+                        mAdditionalStatusDetails = UrlRequestBase.Status.CONNECTING;
                         mUrlConnection.connect();
                         mAdditionalStatusDetails = Status.SENDING_REQUEST;
                         mUrlConnectionOutputStream = mUrlConnection.getOutputStream();
@@ -756,7 +763,8 @@ final class JavaUrlRequest implements UrlRequest {
         State state = mState.get();
         int extraStatus = this.mAdditionalStatusDetails;
 
-        @Status.StatusValues final int status;
+        @Status.StatusValues
+        final int status;
         switch (state) {
             case ERROR:
             case COMPLETE:
@@ -784,7 +792,7 @@ final class JavaUrlRequest implements UrlRequest {
 
     /** This wrapper ensures that callbacks are always called on the correct executor */
     private final class AsyncUrlRequestCallback {
-        final UrlRequest.Callback mCallback;
+        final Callback mCallback;
         final Executor mUserExecutor;
         final Executor mFallbackExecutor;