Move JNI annotations to annotations package.

components/cronet/android/test/src/org/chromium/net/TestUploadDataStreamHandler.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.chromium.net;
 
 import android.os.ConditionVariable;
 
 import junit.framework.Assert;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
-import org.chromium.base.NativeClassQualifiedName;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeClassQualifiedName;
 
 /**
  * A wrapper class on top of the native net::UploadDataStream. This class is
  * used in tests to drive the native UploadDataStream directly.
  */
 @JNINamespace("cronet")
 public final class TestUploadDataStreamHandler {
     private long mTestUploadDataStreamHandler;
     private ConditionVariable mWaitInitCalled = new ConditionVariable();
     private ConditionVariable mWaitInitComplete = new ConditionVariable();
@@ skipping 139 matching lines @@
     @NativeClassQualifiedName("TestUploadDataStreamHandler")
     private native void nativeCheckReadCallbackNotInvoked(
             long nativePtr);
 
     @NativeClassQualifiedName("TestUploadDataStreamHandler")
     private native void nativeDestroy(long nativePtr);
 
     private native long nativeCreateTestUploadDataStreamHandler(
             long uploadDataStream);
 }