Move JNI annotations to annotations package.

base/android/jni_generator/jni_generator_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Tests for jni_generator.py.
 
 This test suite contains various tests for the JNI generator.
 It exercises the low-level parser all the way up to the
 code generator and ensures the output matches a golden
@@ skipping 878 matching lines @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
 import android.os.Process;
 import android.os.RemoteException;
 import android.util.Log;
 import android.view.Surface;
 
 import java.util.ArrayList;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content.app.ContentMain;
 import org.chromium.content.browser.SandboxedProcessConnection;
 import org.chromium.content.common.ISandboxedProcessCallback;
 import org.chromium.content.common.ISandboxedProcessService;
 import org.chromium.content.common.WillNotRaise.AnException;
 import org.chromium.content.common.WillRaise.AnException;
 
 import static org.chromium.Bar.Zoo;
 
 class Foo {
@@ skipping 232 matching lines @@
   test_result = unittest.main(argv=argv[0:1], exit=False)
 
   if test_result.result.wasSuccessful() and options.stamp:
     TouchStamp(options.stamp)
 
   return not test_result.result.wasSuccessful()
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))