Add VisibleForTesting to content/public/android

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
index a8e91e6453045385e57c8ea7220477389e06d55f..72f1158e8ceab3f305e1fb036c2144b6676a33f9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
+++ b/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) {

[Avi (use Gerrit), 2013/01/08 03:10:29]

Uh, the TODO said to remove public. Was it incorrect?

[aruslan, 2013/01/08 03:48:28]

Yes; judging from the name I assumed that there is some magic that would make
the name visible and accessible for the test targets :)
Turns out, it's just a convention.

             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) {