Add VisibleForTesting to content/public/android

BUG=168615


Review URL: https://chromiumcodereview.appspot.com/11784028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175537 0039d316-1c4b-4281-b951-d872f2087c98

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

@@ -29,6 +29,8 @@ import android.provider.Browser.SearchColumns;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import org.chromium.base.CalledByNative;
 import org.chromium.base.CalledByNativeUnchecked;
 import org.chromium.base.ThreadUtils;
@@ -724,8 +726,7 @@ public class ChromeBrowserProvider extends ContentProvider {
         private byte[] mThumbnail;
 
         /** Used to pass structured data back from the native code. */
-        // TODO(leandrogracia): remove public when VisibleForTesting works.
-        // @VisibleForTesting
+        @VisibleForTesting
         public BookmarkNode(long id, Type type, String name, String url, BookmarkNode parent) {
             mId = id;
             mName = name;
@@ -789,8 +790,7 @@ public class ChromeBrowserProvider extends ContentProvider {
          * <p>
          * Used solely by the native code.
          */
-        // TODO(leandrogracia): remove public when VisibleForTesting works.
-        // @VisibleForTesting
+        @VisibleForTesting
         @CalledByNativeUnchecked("BookmarkNode")
         public void addChild(BookmarkNode child) {
             mChildren.add(child);
@@ -840,14 +840,12 @@ public class ChromeBrowserProvider extends ContentProvider {
             return new BookmarkNode(id, Type.values()[type], name, url, parent);
         }
 
-        // TODO(leandrogracia): remove public when VisibleForTesting works.
-        // @VisibleForTesting
+        @VisibleForTesting
         public void setFavicon(byte[] favicon) {
             mFavicon = favicon;
         }
 
-        // TODO(leandrogracia): remove public when VisibleForTesting works.
-        // @VisibleForTesting
+        @VisibleForTesting
         public void setThumbnail(byte[] thumbnail) {
             mThumbnail = thumbnail;
         }
@@ -866,8 +864,7 @@ public class ChromeBrowserProvider extends ContentProvider {
             getHierarchyRoot().writeNodeContentsRecursive(dest);
         }
 
-        // TODO(leandrogracia): remove public when VisibleForTesting works.
-        // @VisibleForTesting
+        @VisibleForTesting
         public BookmarkNode getHierarchyRoot() {
             BookmarkNode root = this;
             while (root.parent() != null) {

content/content.gyp

@@ -284,6 +284,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../net/net.gyp:net',
+            '../third_party/guava/guava.gyp:guava_javalib',
             '../ui/ui.gyp:ui_java',
             'common_aidl',
             'content_common',

content/public/android/java/src/org/chromium/content/browser/ContentView.java

@@ -21,6 +21,8 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.widget.FrameLayout;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import org.chromium.content.common.TraceEvent;
 import org.chromium.ui.gfx.NativeWindow;
 
@@ -211,7 +213,7 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
         mContentViewCore.setContentViewClient(client);
     }
 
-    // @VisibleForTesting
+    @VisibleForTesting
     public ContentViewClient getContentViewClient() {
         return mContentViewCore.getContentViewClient();
     }
@@ -344,18 +346,16 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
     /**
      * Start profiling the update speed. You must call {@link #stopFpsProfiling}
      * to stop profiling.
-     *
-     * @VisibleForTesting
      */
+    @VisibleForTesting
     public void startFpsProfiling() {
         // TODO(nileshagrawal): Implement this.
     }
 
     /**
      * Stop profiling the update speed.
-     *
-     * @VisibleForTesting
      */
+    @VisibleForTesting
     public float stopFpsProfiling() {
         // TODO(nileshagrawal): Implement this.
         return 0.0f;
@@ -367,9 +367,8 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
      * @param y Fling touch starting position
      * @param velocityX Initial velocity of the fling (X) measured in pixels per second.
      * @param velocityY Initial velocity of the fling (Y) measured in pixels per second.
-     *
-     * @VisibleForTesting
      */
+    @VisibleForTesting
     public void fling(long timeMs, int x, int y, int velocityX, int velocityY) {
         mContentViewCore.getContentViewGestureHandler().fling(timeMs, x, y, velocityX, velocityY);
     }
@@ -380,18 +379,16 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
 
     /**
      * Start pinch zoom. You must call {@link #pinchEnd} to stop.
-     *
-     * @VisibleForTesting
      */
+    @VisibleForTesting
     public void pinchBegin(long timeMs, int x, int y) {
         mContentViewCore.getContentViewGestureHandler().pinchBegin(timeMs, x, y);
     }
 
     /**
      * Stop pinch zoom.
-     *
-     * @VisibleForTesting
      */
+    @VisibleForTesting
     public void pinchEnd(long timeMs) {
         mContentViewCore.getContentViewGestureHandler().pinchEnd(timeMs);
     }
@@ -411,9 +408,8 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
      *            coordinate.
      * @param anchorY The magnification anchor (Y) in the current view
      *            coordinate.
-     *
-     * @VisibleForTesting
      */
+    @VisibleForTesting
     public void pinchBy(long timeMs, int anchorX, int anchorY, float delta) {
         mContentViewCore.getContentViewGestureHandler().pinchBy(timeMs, anchorX, anchorY, delta);
     }

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

@@ -37,6 +37,8 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.WeakContext;
@@ -749,8 +751,8 @@ public class ContentViewCore implements MotionEventDelegate, NavigationClient {
      *
      * @param url The URL being blocked by the interstitial.
      * @param delegate The delegate handling the interstitial.
-     * @VisibleForTesting
      */
+    @VisibleForTesting
     public void showInterstitialPage(
             String url, InterstitialPageDelegateAndroid delegate) {
         if (mNativeContentViewCore == 0) return;