Move JNI annotations to annotations package.

The rest of the annotations already live in this package,
so this CL moves CalledByNative, NativeCall, JNIAdditionalImport,
NativeClassQualifiedName and JNINamespace to the same package.

BUG=None
TBR=armansito@chromium.org,asvitkine@chromium.org,atwilson@chromium.org,avayvod@chromium.org,bauerb@chromium.org,boliu@chromium.org,brettw@chromium.org,dtrainor@chromium.org,gunsch@chromium.org,lambroslambrou@chromium.org,mef@chromium.org,mnaganov@chromium.org,mnissler@chromium.org,peter@chromium.org,qinmin@chromium.org,sky@chromium.org,yfriedman@chromium.org,yukawa@chromium.org,zea@chromium.org

Review URL: https://codereview.chromium.org/1263053002

Cr-Commit-Position: refs/heads/master@{#341175}

android_webview/java/src/org/chromium/android_webview/AndroidProtocolHandler.java

@@ -10,8 +10,8 @@ import android.net.Uri;
 import android.util.Log;
 import android.util.TypedValue;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 import java.io.IOException;
 import java.io.InputStream;

android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java

@@ -6,8 +6,8 @@ package org.chromium.android_webview;
 
 import android.view.ViewGroup;
 
-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.browser.ContentViewCore;
 import org.chromium.ui.DropdownItem;
 import org.chromium.ui.autofill.AutofillPopup;

android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -43,11 +43,11 @@ import android.webkit.ValueCallback;
 import android.widget.OverScroller;
 
 import org.chromium.android_webview.permission.AwPermissionRequest;
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
 import org.chromium.components.navigation_interception.NavigationParams;

android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java

@@ -10,9 +10,9 @@ import android.net.http.SslError;
 import android.util.Log;
 import android.webkit.ValueCallback;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.net.AndroidPrivateKey;
 import org.chromium.net.DefaultAndroidKeyStore;
 

android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java

@@ -4,8 +4,8 @@
 
 package org.chromium.android_webview;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 import java.util.HashMap;
 import java.util.Map;

android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java

@@ -4,9 +4,9 @@
 
 package org.chromium.android_webview;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * Implementations of various static methods, and also a home for static

android_webview/java/src/org/chromium/android_webview/AwCookieManager.java

@@ -8,8 +8,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.webkit.ValueCallback;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * AwCookieManager manages cookies according to RFC2109 spec.

android_webview/java/src/org/chromium/android_webview/AwDevToolsServer.java

@@ -4,7 +4,7 @@
 
 package org.chromium.android_webview;
 
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * Controller for Remote Web Debugging (Developer Tools).

android_webview/java/src/org/chromium/android_webview/AwFormDatabase.java

@@ -4,7 +4,7 @@
 
 package org.chromium.android_webview;
 
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * Exposes a subset of Chromium form database to Webview database for managing autocomplete

android_webview/java/src/org/chromium/android_webview/AwHttpAuthHandler.java

@@ -4,8 +4,8 @@
 
 package org.chromium.android_webview;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * See {@link android.webkit.HttpAuthHandler}.

android_webview/java/src/org/chromium/android_webview/AwMessagePortService.java

@@ -6,10 +6,10 @@ package org.chromium.android_webview;
 
 import android.util.SparseArray;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.ObserverList;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * Provides the Message Channel functionality for Android Webview. Specifically

android_webview/java/src/org/chromium/android_webview/AwPdfExporter.java

@@ -12,8 +12,8 @@ import android.util.Log;
 import android.view.ViewGroup;
 import android.webkit.ValueCallback;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * Export the android webview as a PDF.

android_webview/java/src/org/chromium/android_webview/AwPicture.java

@@ -7,7 +7,7 @@ package org.chromium.android_webview;
 import android.graphics.Canvas;
 import android.graphics.Picture;
 
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content.common.CleanupReference;
 
 import java.io.OutputStream;

android_webview/java/src/org/chromium/android_webview/AwQuotaManagerBridge.java

@@ -7,9 +7,9 @@ package org.chromium.android_webview;
 import android.util.SparseArray;
 import android.webkit.ValueCallback;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * Bridge between android.webview.WebStorage and native QuotaManager. This object is owned by Java

android_webview/java/src/org/chromium/android_webview/AwResource.java

@@ -7,8 +7,8 @@ package org.chromium.android_webview;
 import android.content.res.Resources;
 import android.util.SparseArray;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 import java.io.IOException;
 import java.io.InputStreamReader;

android_webview/java/src/org/chromium/android_webview/AwSettings.java

@@ -17,10 +17,10 @@ import android.webkit.WebSettings.LayoutAlgorithm;
 import android.webkit.WebSettings.PluginState;
 import android.webkit.WebSettings.ZoomDensity;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content_public.browser.WebContents;
 
 /**

android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java

@@ -4,9 +4,9 @@
 
 package org.chromium.android_webview;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
 
 /**

android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java

@@ -4,8 +4,8 @@
 
 package org.chromium.android_webview;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 import java.io.InputStream;
 import java.util.Map;

android_webview/java/src/org/chromium/android_webview/InputStreamUtil.java

@@ -6,8 +6,8 @@ package org.chromium.android_webview;
 
 import android.util.Log;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 import java.io.IOException;
 import java.io.InputStream;

android_webview/java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java

@@ -7,8 +7,8 @@ package org.chromium.android_webview;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * Provides auxiliary methods related to Picture objects and native SkPictures.

android_webview/java/src/org/chromium/android_webview/permission/AwPermissionRequest.java

@@ -6,9 +6,9 @@ package org.chromium.android_webview.permission;
 
 import android.net.Uri;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content.common.CleanupReference;
 
 /**

android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java

@@ -4,7 +4,7 @@
 
 package org.chromium.android_webview.unittest;
 
-import org.chromium.base.CalledByNative;
+import org.chromium.base.annotations.CalledByNative;
 
 import java.io.IOException;
 import java.io.InputStream;

android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java

@@ -6,7 +6,7 @@ package org.chromium.android_webview.unittest;
 
 import org.chromium.android_webview.AwContentsClientBridge;
 import org.chromium.android_webview.ClientCertLookupTable;
-import org.chromium.base.CalledByNative;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.net.AndroidKeyStore;
 import org.chromium.net.AndroidPrivateKey;
 import org.chromium.net.DefaultAndroidKeyStore;

base/android/java/src/org/chromium/base/ApkAssets.java

@@ -9,6 +9,9 @@ import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetManager;
 import android.util.Log;
 
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
+
 import java.io.IOException;
 
 /**

base/android/java/src/org/chromium/base/ApplicationStatus.java

@@ -10,6 +10,9 @@ import android.app.Application.ActivityLifecycleCallbacks;
 import android.content.Context;
 import android.os.Bundle;
 
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
+
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;

base/android/java/src/org/chromium/base/BuildInfo.java

@@ -14,6 +14,8 @@ import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 
+import org.chromium.base.annotations.CalledByNative;
+
 /**
  * BuildInfo is a utility class providing easy access to {@link PackageInfo}
  * information. This is primarly of use for accessesing package information

base/android/java/src/org/chromium/base/ContentUriUtils.java

@@ -11,6 +11,8 @@ import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
+import org.chromium.base.annotations.CalledByNative;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 

base/android/java/src/org/chromium/base/CpuFeatures.java

@@ -4,6 +4,8 @@
 
 package org.chromium.base;
 
+import org.chromium.base.annotations.JNINamespace;
+
 // The only purpose of this class is to allow sending CPU properties
 // from the browser process to sandboxed renderer processes. This is
 // needed because sandboxed processes cannot, on ARM, query the kernel

base/android/java/src/org/chromium/base/EventLog.java

@@ -4,6 +4,9 @@
 
 package org.chromium.base;
 
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
+
 /**
  * A simple interface to Android's EventLog to be used by native code.
  */

base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java

@@ -4,6 +4,8 @@
 
 package org.chromium.base;
 
+import org.chromium.base.annotations.JNINamespace;
+
 /**
  * This class provides an interface to the native class for writing
  * important data files without risking data loss.

base/android/java/src/org/chromium/base/JNIUtils.java

@@ -4,6 +4,8 @@
 
 package org.chromium.base;
 
+import org.chromium.base.annotations.CalledByNative;
+
 /**
  * This class provides JNI-related methods to the native library.
  */

base/android/java/src/org/chromium/base/JavaHandlerThread.java

@@ -9,6 +9,9 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
+
 /**
  * This class is an internal detail of the native counterpart.
  * It is instantiated and owned by the native object.

base/android/java/src/org/chromium/base/LocaleUtils.java

@@ -4,6 +4,8 @@
 
 package org.chromium.base;
 
+import org.chromium.base.annotations.CalledByNative;
+
 import java.util.Locale;
 
 /**

base/android/java/src/org/chromium/base/MemoryPressureListener.java

@@ -9,6 +9,8 @@ import android.content.ComponentCallbacks2;
 import android.content.Context;
 import android.content.res.Configuration;
 
+import org.chromium.base.annotations.CalledByNative;
+
 
 /**
  * This is an internal implementation of the C++ counterpart.

base/android/java/src/org/chromium/base/PathService.java

@@ -4,6 +4,8 @@
 
 package org.chromium.base;
 
+import org.chromium.base.annotations.JNINamespace;
+
 /**
  * This class provides java side access to the native PathService.
  */

base/android/java/src/org/chromium/base/PathUtils.java

@@ -9,6 +9,8 @@ import android.content.pm.ApplicationInfo;
 import android.os.AsyncTask;
 import android.os.Environment;
 
+import org.chromium.base.annotations.CalledByNative;
+
 import java.io.File;
 import java.util.concurrent.ExecutionException;
 

base/android/java/src/org/chromium/base/PowerMonitor.java

@@ -11,6 +11,9 @@ import android.os.BatteryManager;
 import android.os.Handler;
 import android.os.Looper;
 
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
+
 
 /**
  * Integrates native PowerMonitor with the java side.

base/android/java/src/org/chromium/base/SysUtils.java

@@ -11,6 +11,8 @@ import android.os.Build;
 import android.os.StrictMode;
 import android.util.Log;
 
+import org.chromium.base.annotations.CalledByNative;
+
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.util.regex.Matcher;

base/android/java/src/org/chromium/base/SystemMessageHandler.java

@@ -9,6 +9,8 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
 
+import org.chromium.base.annotations.CalledByNative;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 

base/android/java/src/org/chromium/base/ThreadUtils.java

@@ -8,6 +8,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 
+import org.chromium.base.annotations.CalledByNative;
+
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;

base/android/java/src/org/chromium/base/TraceEvent.java

@@ -9,6 +9,9 @@ import android.os.MessageQueue;
 import android.os.SystemClock;
 import android.util.Log;
 import android.util.Printer;
+
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 /**
  * Java mirror of Chrome trace event API. See base/trace_event/trace_event.h. Unlike the native
  * version, Java does not have stack objects, so a TRACE_EVENT() which does both TRACE_EVENT_BEGIN()

base/android/java/src/org/chromium/base/annotations/CalledByNative.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base;
+package org.chromium.base.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base;
+package org.chromium.base.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

base/android/java/src/org/chromium/base/annotations/JNINamespace.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base;
+package org.chromium.base.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

base/android/java/src/org/chromium/base/annotations/NativeCall.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base;
+package org.chromium.base.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base;
+package org.chromium.base.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

base/android/java/src/org/chromium/base/library_loader/LegacyLinker.java

@@ -7,10 +7,10 @@ package org.chromium.base.library_loader;
 import android.os.Bundle;
 import android.os.Parcel;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.Log;
 import org.chromium.base.SysUtils;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.CalledByNative;
 
 import java.util.HashMap;
 import java.util.Locale;

base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java

@@ -12,12 +12,12 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.SystemClock;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.CommandLine;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.Log;
 import org.chromium.base.PackageUtils;
 import org.chromium.base.TraceEvent;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.metrics.RecordHistogram;
 
 import java.util.concurrent.atomic.AtomicBoolean;

base/android/java/src/org/chromium/base/metrics/RecordHistogram.java

@@ -4,8 +4,8 @@
 
 package org.chromium.base.metrics;
 
-import org.chromium.base.JNINamespace;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.JNINamespace;
 
 import java.util.concurrent.TimeUnit;
 

base/android/java/src/org/chromium/base/metrics/RecordUserAction.java

@@ -4,8 +4,8 @@
 
 package org.chromium.base.metrics;
 
-import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * Java API for recording UMA actions.

base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java

@@ -6,11 +6,11 @@ package org.chromium.example.jni_generator;
 
 import android.graphics.Rect;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
-import org.chromium.base.NativeClassQualifiedName;
 import org.chromium.base.annotations.AccessedByNative;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.CalledByNativeUnchecked;
+import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeClassQualifiedName;
 
 import java.util.ArrayList;
 import java.util.Iterator;

base/android/jni_generator/jni_generator_tests.py

@@ -896,8 +896,8 @@ 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;

base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java

@@ -10,6 +10,8 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.MediaStore;
 
+import org.chromium.base.annotations.CalledByNative;
+
 /**
  * Utilities for testing operations on content URI.
  */

base/test/android/java/src/org/chromium/base/TestUiThread.java

@@ -6,6 +6,8 @@ package org.chromium.base;
 
 import android.os.Looper;
 
+import org.chromium.base.annotations.CalledByNative;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 

chrome/android/java/src/org/chromium/chrome/browser/AccessibilityUtil.java

@@ -12,8 +12,8 @@ import android.net.Uri;
 import android.support.v7.app.AlertDialog;
 import android.view.accessibility.AccessibilityManager;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.PackageUtils;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 
 import java.util.List;

chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.ObserverList;
+import org.chromium.base.annotations.CalledByNative;
 
 /**
  * Watches for when Chrome is told to restart itself.

chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java

@@ -4,9 +4,9 @@
 
 package org.chromium.chrome.browser;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;

chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

@@ -25,12 +25,12 @@ import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ApplicationStateListener;
 import org.chromium.base.BuildInfo;
-import org.chromium.base.CalledByNative;
 import org.chromium.base.PathUtils;
 import org.chromium.base.ResourceExtractor;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;

chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java

@@ -29,9 +29,9 @@ import android.util.Log;
 import android.util.LongSparseArray;
 
 import org.chromium.base.BuildInfo;
-import org.chromium.base.CalledByNative;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.CalledByNativeUnchecked;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.LibraryProcessType;

chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java

@@ -6,7 +6,7 @@ package org.chromium.chrome.browser;
 
 import android.app.Activity;
 
-import org.chromium.base.CalledByNative;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.ui.base.WindowAndroid;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java

@@ -7,7 +7,7 @@ package org.chromium.chrome.browser;
 import android.graphics.Rect;
 import android.graphics.RectF;
 
-import org.chromium.base.CalledByNative;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.findinpage.FindMatchRectsDetails;
 import org.chromium.chrome.browser.findinpage.FindNotificationDetails;
 import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;

chrome/android/java/src/org/chromium/chrome/browser/ConnectionInfoPopup.java

@@ -22,8 +22,8 @@ import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.Log;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;

chrome/android/java/src/org/chromium/chrome/browser/DevToolsServer.java

@@ -7,7 +7,7 @@ package org.chromium.chrome.browser;
 import android.content.Context;
 import android.content.pm.PackageManager;
 
-import org.chromium.base.CalledByNative;
+import org.chromium.base.annotations.CalledByNative;
 
 /**
  * Controller for Remote Web Debugging (Developer Tools).

chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java

@@ -12,8 +12,8 @@ import android.text.Html;
 import android.text.TextUtils;
 import android.util.Patterns;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.ContentUriUtils;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.sync.signin.AccountManagerHelper;
 
 import java.io.File;

chrome/android/java/src/org/chromium/chrome/browser/JavaExceptionReporter.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * This UncaughtExceptionHandler will create a breakpad minidump when there is an uncaught

chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java

@@ -16,8 +16,8 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.ui.base.WindowAndroid;
 

chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java

@@ -21,8 +21,8 @@ import android.widget.ListPopupWindow;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.NavigationEntry;
 import org.chromium.content_public.browser.NavigationHistory;

chrome/android/java/src/org/chromium/chrome/browser/PasswordUIView.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.ObserverList;
+import org.chromium.base.annotations.CalledByNative;
 
 /**
  * Class for retrieving passwords and password exceptions (websites for which Chrome should not save

chrome/android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java

@@ -12,9 +12,9 @@ import android.security.KeyChainAliasCallback;
 import android.security.KeyChainException;
 import android.util.Log;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.browser.smartcard.PKCS11AuthenticationManager;
 import org.chromium.net.AndroidPrivateKey;
 import org.chromium.net.DefaultAndroidKeyStore;

chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java

@@ -13,8 +13,8 @@ import android.util.Base64;
 import android.widget.Toast;
 
 import org.chromium.base.ApplicationStatus;
-import org.chromium.base.CalledByNative;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.tab.Tab;

chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java

@@ -7,8 +7,8 @@ package org.chromium.chrome.browser;
 import android.content.Context;
 import android.view.ViewGroup.LayoutParams;
 
-import org.chromium.base.JNINamespace;
 import org.chromium.base.TraceEvent;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.content.browser.ContentViewCore;

chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java

@@ -9,9 +9,9 @@ import android.os.Build;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.UtteranceProgressListener;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
+import org.chromium.base.annotations.CalledByNative;
 
 import java.util.ArrayList;
 import java.util.HashMap;

chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

@@ -43,8 +43,8 @@ import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.CommandLine;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;

chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java

@@ -9,9 +9,9 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.preference.PreferenceManager;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.NativeCall;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.NativeCall;
 
 import java.util.HashMap;
 import java.util.Map;

chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java

@@ -4,9 +4,9 @@
 
 package org.chromium.chrome.browser.autofill;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.ui.base.WindowAndroid;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogResult.java

@@ -4,9 +4,9 @@
 
 package org.chromium.chrome.browser.autofill;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * Java-side result of a non-cancelled AutofillDialog invocation, and

chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryBridge.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser.autofill;
 
-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.chrome.browser.ResourceId;
 import org.chromium.ui.DropdownItem;
 import org.chromium.ui.autofill.AutofillKeyboardAccessory;

chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java

@@ -4,9 +4,9 @@
 
 package org.chromium.chrome.browser.autofill;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
 * JNI call glue for AutofillExternalDelagate C++ and Java objects.

chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java

@@ -10,8 +10,8 @@ import android.content.DialogInterface;
 import android.os.Handler;
 import android.support.v7.app.AlertDialog;
 
-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.chrome.R;
 import org.chromium.chrome.browser.ResourceId;
 import org.chromium.ui.DropdownItem;

chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java

@@ -7,8 +7,8 @@ package org.chromium.chrome.browser.autofill;
 import android.app.Activity;
 import android.os.Handler;
 
-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.chrome.browser.ResourceId;
 import org.chromium.chrome.browser.autofill.CardUnmaskPrompt.CardUnmaskPromptDelegate;
 import org.chromium.ui.base.WindowAndroid;

chrome/android/java/src/org/chromium/chrome/browser/autofill/CreditCardScanner.java

@@ -6,8 +6,8 @@ package org.chromium.chrome.browser.autofill;
 
 import android.content.Context;
 
-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.ui.base.WindowAndroid;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationPopupBridge.java

@@ -10,8 +10,8 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.PopupWindow;
 
-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.ui.DropdownPopupWindow;
 import org.chromium.ui.R;
 import org.chromium.ui.base.ViewAndroidDelegate;

chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java

@@ -6,10 +6,10 @@ package org.chromium.chrome.browser.autofill;
 
 import android.content.Context;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 
 import java.util.ArrayList;

chrome/android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java

@@ -8,9 +8,9 @@ import android.content.Context;
 import android.text.TextUtils;
 
 import org.chromium.base.ApplicationStatus;
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BookmarkUtils;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;

chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java

@@ -6,8 +6,8 @@ package org.chromium.chrome.browser.childaccounts;
 
 import android.app.Activity;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.feedback.FeedbackCollector;
 import org.chromium.chrome.browser.feedback.FeedbackReporter;

chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java

@@ -12,12 +12,12 @@ import android.accounts.OperationCanceledException;
 import android.content.Context;
 import android.content.Intent;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.CommandLine;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.services.AccountsChangedReceiver;
 import org.chromium.chrome.browser.signin.SigninManager;

chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java

@@ -15,12 +15,12 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.CommandLine;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.Log;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.compositor.layouts.Layout;

chrome/android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java

@@ -9,8 +9,8 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.util.SparseArray;
 
-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.chrome.R;
 import org.chromium.ui.resources.ResourceManager;
 import org.chromium.ui.resources.dynamics.BitmapDynamicResource;

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java

@@ -10,10 +10,10 @@ import android.graphics.Canvas;
 import android.util.SparseArray;
 import android.view.View;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.CommandLine;
-import org.chromium.base.JNINamespace;
 import org.chromium.base.PathUtils;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.NativePage;

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java

@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.compositor.scene_layer;
 
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanelFeatures;

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java

@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.compositor.scene_layer;
 
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.dom_distiller.ReaderModePanel;
 import org.chromium.content.browser.ContentViewCore;

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/SceneLayer.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser.compositor.scene_layer;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * Java representation of a scene layer.

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java

@@ -6,7 +6,7 @@ package org.chromium.chrome.browser.compositor.scene_layer;
 
 import android.graphics.Rect;
 
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.browser.compositor.LayerTitleCache;
 import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java

@@ -8,7 +8,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Rect;
 
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.LayerTitleCache;
 import org.chromium.chrome.browser.compositor.layouts.Layout;

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java

@@ -6,7 +6,7 @@ package org.chromium.chrome.browser.compositor.scene_layer;
 
 import android.content.Context;
 
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.browser.compositor.LayerTitleCache;
 import org.chromium.chrome.browser.compositor.layouts.components.CompositorButton;
 import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutHelperManager;

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java

@@ -12,8 +12,8 @@ import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
 import android.view.View.OnCreateContextMenuListener;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.content.browser.ContentViewCore;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java

@@ -6,8 +6,8 @@ package org.chromium.chrome.browser.contextmenu;
 
 import android.text.TextUtils;
 
-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_public.common.Referrer;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

@@ -15,9 +15,9 @@ import android.view.ViewTreeObserver.OnGlobalFocusChangeListener;
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ActivityStateListener;
-import org.chromium.base.CalledByNative;
 import org.chromium.base.SysUtils;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.WebContentsFactory;

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java

@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.contextualsearch;
 
-import org.chromium.base.CalledByNative;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.profiles.Profile;

chrome/android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java

@@ -8,9 +8,9 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.ImportantFileWriterAndroid;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.content.browser.crypto.CipherFactory;
 import org.chromium.content.common.CleanupReference;